bug#33046: pypi importer doesn't print the correct source

[Maxim Cournoyer]

Hello!

Julien Lepiller <address@hidden> writes:

> Hi, I tried to use the importer to refresh python-twisted, and got
> this source:
>
> (uri (pypi-uri "twisted" version))
>
> while the correct one should be
>
> (uri (pypi-uri "Twisted" version ".tar.bz2"))

I believe the attached patch fixes this :-). It's based on the patch set
attached to bug #24450 though, so that one should be reviewed/merged
first.

Here's the result, for a couple packages that were problematic in the
mixed case regards:

--8<---------------cut here---------------start------------->8---
./pre-inst-env guix import pypi Twisted

Starting download of /tmp/guix-file.BdpmRc
>From 
>https://files.pythonhosted.org/packages/5d/0e/a72d85a55761c2c3ff1cb968143a2fd5f360220779ed90e0fadf4106d4f2/Twisted-18.9.0.tar.bz2...
 …9.0.tar.bz2  2.9MiB                 1.5MiB/s 00:02 [##################] 100.0%
(package
  (name "python-twisted")
  (version "18.9.0")
  (source
    (origin
      (method url-fetch)
      (uri (pypi-uri "Twisted" version))
      (sha256
        (base32
          "15d3gmkrg8g27hyd6ihawv2y2dv5gnpyg67wy9npgbl4pz3f4jr9"))))
  (build-system python-build-system)
  (propagated-inputs
    `(("python-attrs" ,python-attrs)
      ("python-automat" ,python-automat)
      ("python-constantly" ,python-constantly)
      ("python-hyperlink" ,python-hyperlink)
      ("python-incremental" ,python-incremental)
      ("python-pyhamcrest" ,python-pyhamcrest)
      ("python-zope.interface" ,python-zope.interface)))
  (native-inputs
    `(("python-pydoctor" ,python-pydoctor)
      ("python-pyflakes" ,python-pyflakes)
      ("python-sphinx" ,python-sphinx)
      ("python-subunit" ,python-subunit)
      ("python-towncrier" ,python-towncrier)
      ("python-twisted-dev-tools"
       ,python-twisted-dev-tools)
      ("python-twistedchecker" ,python-twistedchecker)))
  (home-page "http://twistedmatrix.com/";)
  (synopsis
    "An asynchronous networking framework written in Python")
  (description
    "An asynchronous networking framework written in Python")
  (license license:expat))
--8<---------------cut here---------------end--------------->8---


--8<---------------cut here---------------start------------->8---
./pre-inst-env guix import pypi uWSGI

Starting download of /tmp/guix-file.TNSMx7
>From 
>https://files.pythonhosted.org/packages/e7/1e/3dcca007f974fe4eb369bf1b8629d5e342bb3055e2001b2e5340aaefae7a/uwsgi-2.0.18.tar.gz...
 ….18.tar.gz  783KiB                  751KiB/s 00:01 [##################] 100.0%
guix import: warning: Cannot guess requirements from source archive: no 
requires.txt file found.
(package
  (name "python-uwsgi")
  (version "2.0.18")
  (source
    (origin
      (method url-fetch)
      (uri (pypi-uri "uwsgi" version))
      (sha256
        (base32
          "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"))))
  (build-system python-build-system)
  (home-page
    "https://uwsgi-docs.readthedocs.io/en/latest/";)
  (synopsis "The uWSGI server")
  (description "The uWSGI server")
  (license #f))
--8<---------------cut here---------------end--------------->8---

--8<---------------cut here---------------start------------->8---
./pre-inst-env guix import pypi Deprecated

Starting download of /tmp/guix-file.cHmIDG
>From 
>https://files.pythonhosted.org/packages/2c/6a/f7c9d1db90d758a9dc21daaa5660a01b3ab22ca56533f6a62b24c0d113e6/Deprecated-1.2.5.tar.gz...
 …1.2.5.tar.gz  4.8MiB                1.2MiB/s 00:04 [##################] 100.0%

Starting download of /tmp/guix-file.Yj88Cr
>From 
>https://files.pythonhosted.org/packages/9f/7a/003fa432f1e45625626549726c2fbb7a29baa764e9d1fdb2323a5d779f8a/Deprecated-1.2.5-py2.py3-none-any.whl...
 …y2.py3-none-any.whl  8KiB           2.1MiB/s 00:00 [##################] 100.0%
(package
  (name "python-deprecated")
  (version "1.2.5")
  (source
    (origin
      (method url-fetch)
      (uri (pypi-uri "Deprecated" version))
      (sha256
        (base32
          "0mw5hv0bci5lzzi7ip62vm1ivmxhqj7zwc557p7iyjz3xsq3wa9g"))))
  (build-system python-build-system)
  (propagated-inputs
    `(("python-wrapt" ,python-wrapt)))
  (native-inputs
    `(("python-bumpversion" ,python-bumpversion)
      ("python-pytest" ,python-pytest)
      ("python-pytest-cov" ,python-pytest-cov)
      ("python-sphinx" ,python-sphinx)
      ("python-tox" ,python-tox)))
  (home-page
    "https://github.com/tantale/deprecated";)
  (synopsis
    "Python @deprecated decorator to deprecate old python classes, functions or 
methods.")
  (description
    "Python @deprecated decorator to deprecate old python classes, functions or 
methods.")
  (license license:expat))
--8<---------------cut here---------------end--------------->8---

0001-import-pypi-Preserve-package-name-case-when-forming-.patch
Description: Text Data

Maxim