[bug#39932] [PATCH 0/3] python-virtualenv: Update to 20.0.8.

[bug#39932] [PATCH 0/3] python-virtualenv: Update to 20.0.8.

[Jakub Kądziołka]

I have ran into an issue with virtualenv (see #39930). I have thought
that updating the package might help, but it didn't change anything. Either
way, the task was non-trivial enough to benefit from your review.

Jakub Kądziołka (3):
  gnu: python-xyz: Add python-distlib.
  gnu: python-xyz: Add python-filelock.
  gnu: python-virtualenv: Update to 20.0.8.

 gnu/packages/python-xyz.scm | 80 +++++++++++++++++++++++++++++++------
 1 file changed, 67 insertions(+), 13 deletions(-)

-- 
2.25.1

[bug#39932] [PATCH 1/3] gnu: python-xyz: Add python-distlib.

[Jakub Kądziołka]

* gnu/packages/python-xyz.scm (python-distlib): New variable.
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3cd1686d28..2dfda3d26d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4410,6 +4410,38 @@ by pycodestyle.")
 (define-public python2-autopep8
   (package-with-python2 python-autopep8))
 
+(define-public python-distlib
+  (package
+    (name "python-distlib")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "distlib" version ".zip"))
+       (sha256
+        (base32
+         "08fyi2r246733vharl2yckw20rilci28r91mzrnnvcr638inw5if"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'no-/bin/sh
+           (lambda _
+             (substitute* '("distlib/scripts.py" "tests/test_scripts.py")
+               (("/bin/sh") (which "sh")))))
+         (add-before 'check 'prepare-test-env
+           (lambda _
+             (setenv "HOME" "/tmp")
+             ;; NOTE: Any value works, the variable just has to be present.
+             (setenv "SKIP_ONLINE" "1"))))))
+    (native-inputs `(("unzip" ,unzip)))
+    (home-page "https://bitbucket.org/pypa/distlib")
+    (synopsis "Distribution utilities")
+    (description "Distlib is a library which implements low-level functions that
+relate to packaging and distribution of Python software.  It is intended to be
+used as the basis for third-party packaging tools.")
+    (license license:psfl)))
+
 (define-public python-distutils-extra
   (package
     (name "python-distutils-extra")
-- 
2.25.1

[bug#39932] [PATCH 2/3] gnu: python-xyz: Add python-filelock.

[Jakub Kądziołka]

* gnu/packages/python-xyz.scm (python-filelock): New variable.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2dfda3d26d..c3d08844e6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -670,6 +670,26 @@ API for locking files.")
 (define-public python2-lockfile
   (package-with-python2 python-lockfile))
 
+(define-public python-filelock
+  (package
+    (name "python-filelock")
+    (version "3.0.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "filelock" version))
+       (sha256
+        (base32
+         "0ngzlvb5j8gqs2nxlp2b0jhzii792h66wsn694qm8kqixr225n0q"))))
+    (build-system python-build-system)
+    (home-page
+     "https://github.com/benediktschmitt/py-filelock")
+    (synopsis "A platform independent file lock")
+    (description "@code{filelock} contains a single module implementing
+a platform independent file lock in Python, which provides a simple way of
+inter-process communication.")
+    (license license:unlicense)))
+
 (define-public python-semantic-version
   (package
     (name "python-semantic-version")
-- 
2.25.1

[bug#39932] [PATCH 3/3] gnu: python-virtualenv: Update to 20.0.8.

[Jakub Kądziołka]

* gnu/packages/python-xyz.scm (python-virtualenv): Update to 20.0.8.
  [arguments]: Remove the now-redundant 'disable-failing-test phase.
  [native-inputs]: Add python-setuptools and python-setuptools-scm.
  [inputs]: Add python-{appdirs, distlib, filelock, six,
  importlib-metadata}.
---
 gnu/packages/python-xyz.scm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3d08844e6..6131baf5ea 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2397,28 +2397,30 @@ e.g. filters, callbacks and errbacks can all be promises.")
 (define-public python-virtualenv
   (package
     (name "python-virtualenv")
-    (version "16.1.0")
+    (version "20.0.8")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "virtualenv" version))
        (sha256
         (base32
-         "0242cg3hdq3qdvx5flyrki8lpwlgwf5k45c21ks5049fv7ygm6gq"))))
+         "096r7g5cv85vxymg9iqbn5z749613snlvd6p3rf1nxnrd386j0qz"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'disable-failing-test
-           (lambda _
-             ;; Disable failing test.  See upstream bug report
-             ;; https://github.com/pypa/virtualenv/issues/957
-             (substitute* "tests/test_virtualenv.py"
-               (("skipif.*") "skipif(True, reason=\"Guix\")\n"))
-             #t)))))
     (native-inputs
      `(("python-mock" ,python-mock)
-       ("python-pytest" ,python-pytest)))
+       ("python-pytest" ,python-pytest)
+       ;; NOTE: guix lint remarks that "python-setuptools should probably not
+       ;; be an input at all". However, removing the input makes the build error:
+       ;; File "setup.py", line 4, in <module>
+       ;;   raise RuntimeError("setuptools >= 41 required to build")
+       ("python-setuptools" ,python-setuptools)
+       ("python-setuptools-scm" ,python-setuptools-scm)))
+    (inputs
+     `(("python-appdirs" ,python-appdirs)
+       ("python-distlib" ,python-distlib)
+       ("python-filelock" ,python-filelock)
+       ("python-six" ,python-six)
+       ("python-importlib-metadata" ,python-importlib-metadata)))
     (home-page "https://virtualenv.pypa.io/")
     (synopsis "Virtual Python environment builder")
     (description
-- 
2.25.1

[bug#39932] [PATCH 1/3] gnu: python-xyz: Add python-distlib.

[Ludovic Courtès]

Hello,

Jakub Kądziołka <kuba@kadziolka.net> skribis:

> * gnu/packages/python-xyz.scm (python-distlib): New variable.

[...]

> +       (modify-phases %standard-phases
> +         (add-before 'build 'no-/bin/sh
> +           (lambda _
> +             (substitute* '("distlib/scripts.py" "tests/test_scripts.py")
> +               (("/bin/sh") (which "sh")))))
> +         (add-before 'check 'prepare-test-env
> +           (lambda _
> +             (setenv "HOME" "/tmp")
> +             ;; NOTE: Any value works, the variable just has to be present.
> +             (setenv "SKIP_ONLINE" "1"))))))

Please return #t from both phases, as is conventional.

Apart from that, all 3 patches LGTM!

Thanks,
Ludo’.

bug#39932: [PATCH 1/3] gnu: python-xyz: Add python-distlib.

[Jakub Kądziołka]

[-- Attachment #1: Type: text/plain, Size: 1013 bytes --]

On Sun, Mar 08, 2020 at 09:18:12PM +0100, Ludovic Courtès wrote:
> Hello,
> 
> Jakub Kądziołka <kuba@kadziolka.net> skribis:
> 
> > * gnu/packages/python-xyz.scm (python-distlib): New variable.
> 
> [...]
> 
> > +       (modify-phases %standard-phases
> > +         (add-before 'build 'no-/bin/sh
> > +           (lambda _
> > +             (substitute* '("distlib/scripts.py" "tests/test_scripts.py")
> > +               (("/bin/sh") (which "sh")))))
> > +         (add-before 'check 'prepare-test-env
> > +           (lambda _
> > +             (setenv "HOME" "/tmp")
> > +             ;; NOTE: Any value works, the variable just has to be present.
> > +             (setenv "SKIP_ONLINE" "1"))))))
> 
> Please return #t from both phases, as is conventional.
Argh, I'm always forgetting about that. It would be nice to have a lint
for this...

> Apart from that, all 3 patches LGTM!
Thanks! I pushed the commits, the last one got a hash of
94d57ba3399aeb1b34d52e5e866c609f5a18ec2b

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#39932] Addendum: python-virtualenv: Update to 20.0.8.

[Jakub Kądziołka]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

I forgot to re-lint my packages after addressing some, but as it turns
out, not all complaints of the linker. I will modify the relevant patch
as follows when committing:

@@ -684,7 +684,7 @@ API for locking files.")
     (build-system python-build-system)
     (home-page
      "https://github.com/benediktschmitt/py-filelock")
-    (synopsis "A platform independent file lock")
+    (synopsis "Platform independent file lock")
     (description "@code{filelock} contains a single module implementing
 a platform independent file lock in Python, which provides a simple way of
 inter-process communication.")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]