[PATCH 0/6] Pytest update

[PATCH 0/6] Pytest update

[Leo Famulari]

The latest version of python-cryptography requires python-pytest >= 2.9 
[0]. So, this patch series updates pytest, and fixes the breakage I was 
able to find.

I tested most of the packages that use pytest, but not all of the 
scientific / statistical computing packages, because they take forever
to build. This is how I found the issues with virtualenv, pip, and 
scripttest.

This release of pytest exits with an error if it can't find a test suite
to run. So, we disable the check phases of virtualenv, pip, and 
scripttest, because their test suites are not distributed via PyPi. If
we want to run their test suites, we should package a source code
snapshot instead of building from the release tarballs.

Pytest-runner must be updated to use the new pytest.

"Building the following 77 packages would ensure 210 dependent packages
are rebuilt"...

[0]
https://github.com/pyca/cryptography/issues/3034

Leo Famulari (6):
  gnu: python-virtualenv: Disable tests.
  gnu: python-pip: Disable tests.
  gnu: python-scripttest: Disable tests.
  gnu: python-pytest: Update to 2.9.2.
  gnu: python-pytest-runner: Update to 2.8.
  gnu: python-cryptopgraphy: Update to 1.4.

 gnu/packages/python.scm | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

-- 
2.9.0

[PATCH 1/6] gnu: python-virtualenv: Disable tests.

[Leo Famulari]

* gnu/packages/python.scm (python-virtualenv, python2-virtualenv)
[arguments]: Disable tests.
[inputs]: Remove python-mock, python-pytest.
---
 gnu/packages/python.scm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 597ca6a..d646d94 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2483,14 +2483,9 @@ object.")
          "1p732accxwqfjbdna39k8w8lp9gyw91vr4kzkhm8mgfxikqqxg5a"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-        (replace 'check
-         (lambda _ (zero? (system* "py.test")))))))
+     `(#:tests? #f)) ; Tests are not included in the PyPi release.
     (inputs
-     `(("python-setuptools" ,python-setuptools)
-       ("python-mock" ,python-mock)
-       ("python-pytest" ,python-pytest)))
+     `(("python-setuptools" ,python-setuptools)))
     (home-page "https://virtualenv.pypa.io/")
     (synopsis "Virtual Python environment builder")
     (description
-- 
2.9.0

[PATCH 2/6] gnu: python-pip: Disable tests.

[Leo Famulari]

* gnu/packages/python.scm (python-pip, python2-pip)[arguments]: Disable tests.
[inputs]: Remove python-mock, python-pytest, python-scripttest,
python-virtualenv.
---
 gnu/packages/python.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d646d94..3e71183 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6051,13 +6051,10 @@ library.")
         (base32
          "08cm8d4228fj0qnrysy3qv1a6022zr3dcs25amd14lgxil6vvx26"))))
     (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; Tests are not included in the PyPi release.
     (inputs
-      `(("python-setuptools" ,python-setuptools)
-        ("python-virtualenv" ,python-virtualenv)
-        ;; Tests
-        ("python-mock" ,python-mock)
-        ("python-pytest" ,python-pytest)
-        ("python-scripttest" ,python-scripttest)))
+      `(("python-setuptools" ,python-setuptools)))
     (home-page "https://pip.pypa.io/")
     (synopsis
       "Package manager for Python software")
-- 
2.9.0

[PATCH 3/6] gnu: python-scripttest: Disable tests.

[Leo Famulari]

* gnu/packages/python.scm (python-scripttest, python2-scripttest)
[arguments]: Disable tests.
[inputs]: Remove python-pytest.
---
 gnu/packages/python.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3e71183..28984b0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1710,9 +1710,10 @@ result back.")
         (base32
          "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m"))))
     (build-system python-build-system)
+    (arguments
+      '(#:tests? #f)) ; Tests are not included in the PyPi release.
     (inputs
-     `(("python-setuptools" ,python-setuptools)
-       ("python-pytest" ,python-pytest)))
+     `(("python-setuptools" ,python-setuptools)))
     (home-page "http://pythonpaste.org/scripttest/")
     (synopsis "Python library to test command-line scripts")
     (description "Scripttest is a Python helper library for testing
-- 
2.9.0

[PATCH 4/6] gnu: python-pytest: Update to 2.9.2.

[Leo Famulari]

* gnu/packages/python.scm (python-pytest, python2-pytest): Update to 2.9.2.
[source]: Use pypi-uri.
---
 gnu/packages/python.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 28984b0..c94343b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1545,16 +1545,14 @@ code introspection, and logging.")
 (define-public python-pytest
   (package
     (name "python-pytest")
-    (version "2.7.3")
+    (version "2.9.2")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/p/pytest/pytest-"
-             version ".tar.gz"))
+       (uri (pypi-uri "pytest" version))
        (sha256
         (base32
-         "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"))
+         "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"))
        (modules '((guix build utils)))
        (snippet
         ;; One of the tests involves the /usr directory, so it fails.
-- 
2.9.0

[PATCH 5/6] gnu: python-pytest-runner: Update to 2.8.

[Leo Famulari]

* gnu/packages/python.scm (python-pytest-runner, python2-pytest-runner):
Update to 2.8.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c94343b..f9bedba 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1610,14 +1610,14 @@ supports coverage of subprocesses.")
 (define-public python-pytest-runner
   (package
     (name "python-pytest-runner")
-    (version "2.6.2")
+    (version "2.8")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest-runner" version))
        (sha256
         (base32
-         "1nwcqx0l3fv52kv8526wy8ypzghbq96c96di318d98d3wh7a8xg7"))))
+         "0p0dd3878sjnk59sk17jl6n0j9is9160mi33smgzhld5vbnlvi0y"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
2.9.0

[PATCH 6/6] gnu: python-cryptopgraphy: Update to 1.4.

[Leo Famulari]

* gnu/packages/python.scm (python-cryptography, python2-cryptography):
Update to 1.4.
(python-cryptography-vectors, python2-cryptography-vectors): Update to 1.4.
---
 gnu/packages/python.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f9bedba..381907e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5936,14 +5936,14 @@ responses, rather than doing any computation.")
 (define-public python-cryptography-vectors
   (package
     (name "python-cryptography-vectors")
-    (version "1.3.4")
+    (version "1.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography_vectors" version))
        (sha256
         (base32
-         "15h1iz2klnpb4f8djxy7cpbnyn3wbjp7bnj4pz6s7w6plghbq524"))))
+         "1sk6yhphk2k2vzshi0djxi0jsxd9a02259bs8gynfgf5y1g82a07"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-setuptools" ,python-setuptools)))
@@ -5960,14 +5960,14 @@ responses, rather than doing any computation.")
 (define-public python-cryptography
   (package
     (name "python-cryptography")
-    (version "1.3.4")
+    (version "1.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography" version))
        (sha256
         (base32
-         "1a85l548w5vvq3yhz0az7ajg2ijixzp6gagapw6wgrqvq28ghgs2"))))
+         "0a6i4914ychryj7kqqmf970incynj5lzx57n3cbv5i4hxm09a55v"))))
     (build-system python-build-system)
     (inputs
      `(("openssl" ,openssl)))
-- 
2.9.0

Re: [PATCH 0/6] Pytest update

[Efraim Flashner]

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

On Sat, Jul 02, 2016 at 09:10:12PM -0400, Leo Famulari wrote:
> The latest version of python-cryptography requires python-pytest >= 2.9 
> [0]. So, this patch series updates pytest, and fixes the breakage I was 
> able to find.
> 
> I tested most of the packages that use pytest, but not all of the 
> scientific / statistical computing packages, because they take forever
> to build. This is how I found the issues with virtualenv, pip, and 
> scripttest.
> 
> This release of pytest exits with an error if it can't find a test suite
> to run. So, we disable the check phases of virtualenv, pip, and 
> scripttest, because their test suites are not distributed via PyPi. If
> we want to run their test suites, we should package a source code
> snapshot instead of building from the release tarballs.
> 
> Pytest-runner must be updated to use the new pytest.
> 
> "Building the following 77 packages would ensure 210 dependent packages
> are rebuilt"...
> 
> [0]
> https://github.com/pyca/cryptography/issues/3034
> 
> Leo Famulari (6):
>   gnu: python-virtualenv: Disable tests.
>   gnu: python-pip: Disable tests.
>   gnu: python-scripttest: Disable tests.
>   gnu: python-pytest: Update to 2.9.2.
>   gnu: python-pytest-runner: Update to 2.8.
>   gnu: python-cryptopgraphy: Update to 1.4.
> 
>  gnu/packages/python.scm | 43 +++++++++++++++++--------------------------
>  1 file changed, 17 insertions(+), 26 deletions(-)
> 
> -- 
> 2.9.0
> 
> 

The patch-set looks good to me. For the curious, I checked python-pytest
and python2-pytest and ended up with 81 packages and 235 dependants, but
some of those are from my WIP tree in GUIX_PACKAGE_PATH

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

Re: [PATCH 0/6] Pytest update

[Leo Famulari]

On Sun, Jul 03, 2016 at 08:58:39AM +0300, Efraim Flashner wrote:
> The patch-set looks good to me. For the curious, I checked python-pytest
> and python2-pytest and ended up with 81 packages and 235 dependants, but
> some of those are from my WIP tree in GUIX_PACKAGE_PATH

What branch should it go on?

Also, it would be good to push this series and the Sphinx series
together.

$ guix refresh -l python-sphinx python2-sphinx python-pytest python2-pytest
Building the following 84 packages would ensure 229 dependent packages are rebuilt:
[...]

So, it's basically the same set of packages that would need to be
re-built.

Re: [PATCH 0/6] Pytest update

[Leo Famulari]

On Sun, Jul 03, 2016 at 04:15:17PM -0400, Leo Famulari wrote:
> On Sun, Jul 03, 2016 at 08:58:39AM +0300, Efraim Flashner wrote:
> > The patch-set looks good to me. For the curious, I checked python-pytest
> > and python2-pytest and ended up with 81 packages and 235 dependants, but
> > some of those are from my WIP tree in GUIX_PACKAGE_PATH
> 
> What branch should it go on?

Should it go on the python-updates that will include python-3.5 and
Hartmut's Python patches?

Re: [PATCH 0/6] Pytest update

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Sun, Jul 03, 2016 at 08:58:39AM +0300, Efraim Flashner wrote:
>> The patch-set looks good to me. For the curious, I checked python-pytest
>> and python2-pytest and ended up with 81 packages and 235 dependants, but
>> some of those are from my WIP tree in GUIX_PACKAGE_PATH
>
> What branch should it go on?
>
> Also, it would be good to push this series and the Sphinx series
> together.
>
> $ guix refresh -l python-sphinx python2-sphinx python-pytest python2-pytest
> Building the following 84 packages would ensure 229 dependent packages are rebuilt:
> [...]
>
> So, it's basically the same set of packages that would need to be
> re-built.

The ‘python-updates’ branch would seem right to me.

Thanks,
Ludo’.

Re: [PATCH 0/6] Pytest update

[Leo Famulari]

On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
> The ‘python-updates’ branch would seem right to me.

The brand new python-updates branch is now ready for more Python-related
commits!

Re: [PATCH 0/6] Pytest update

[Leo Famulari]

On Mon, Jul 11, 2016 at 11:50:47AM -0400, Leo Famulari wrote:
> On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
> > The ‘python-updates’ branch would seem right to me.
> 
> The brand new python-updates branch is now ready for more Python-related
> commits!

I forgot to sign these commits, so I deleted the branch and pushed
again. Sorry for the annoyance if you'd already checked out the branch.

python-updates!

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
>> The ‘python-updates’ branch would seem right to me.
>
> The brand new python-updates branch is now ready for more Python-related
> commits!

Excellent.  Time to apply the Python updates that Chris and Hartmut (I
think?) submitted a while back!

Thanks,
Ludo’.

Re: python-updates!

[Christopher Allan Webber]

Ludovic Courtès writes:

> Leo Famulari <leo@famulari.name> skribis:
>
>> On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
>>> The ‘python-updates’ branch would seem right to me.
>>
>> The brand new python-updates branch is now ready for more Python-related
>> commits!
>
> Excellent.  Time to apply the Python updates that Chris and Hartmut (I
> think?) submitted a while back!
>
> Thanks,
> Ludo’.

Yes, I submitted a patch with support for Python 3.5, built off of
Diane's work.  There were a couple of smallish things that you (Ludo)
asked me to do... unfortunately I haven't gotten to it... but it
shouldn't take anyone long, if someone gets to it before I do.

python-updates

[Ludovic Courtès]

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

Hello!

Leo Famulari <leo@famulari.name> skribis:

> On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
>> The ‘python-updates’ branch would seem right to me.
>
> The brand new python-updates branch is now ready for more Python-related
> commits!

The build farm is almost idle now, apart from a long list of mips64el
builds.  So I think it’s time to merge master in python-updates and get
it built!  Thoughts?

I think it’s a good idea to upgrade Guile 2.0 at the same time, since
that’s a safe upgrade.  The patch below does that, but note that it does
not change ‘guile-2.0/fixed’, which is the Guile we use in all the
derivations; that one we’ll upgrade in core-updates.

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1582 bytes --]

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index f50605a..f39e768 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -130,14 +130,14 @@ without requiring the source code to be rewritten.")
 (define-public guile-2.0
   (package
    (name "guile")
-   (version "2.0.11")
+   (version "2.0.12")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/guile/guile-" version
                                 ".tar.xz"))
             (sha256
              (base32
-              "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"))
+              "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy"))
             (patches (search-patches "guile-arm-fixes.patch"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkgconfig" ,pkg-config)))
@@ -199,7 +199,17 @@ without requiring the source code to be rewritten.")
 (define-public guile-2.0/fixed
   ;; A package of Guile 2.0 that's rarely changed.  It is the one used
   ;; in the `base' module, and thus changing it entails a full rebuild.
-  guile-2.0)
+  (package
+    (inherit guile-2.0)
+    (version "2.0.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/guile/guile-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"))
+              (patches (search-patches "guile-arm-fixes.patch"))))))
 
 (define-public guile-next
   (package (inherit guile-2.0)

Re: python-updates

[Leo Famulari]

On Thu, Aug 04, 2016 at 10:56:51PM +0200, Ludovic Courtès wrote:
> Hello!
> 
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Mon, Jul 11, 2016 at 10:29:48AM +0200, Ludovic Courtès wrote:
> >> The ‘python-updates’ branch would seem right to me.
> >
> > The brand new python-updates branch is now ready for more Python-related
> > commits!
> 
> The build farm is almost idle now, apart from a long list of mips64el
> builds.  So I think it’s time to merge master in python-updates and get
> it built!  Thoughts?

I'd like to upgrade setuptools as well. I should have pushed a patch for
that in an hour or so.

> that’s a safe upgrade.  The patch below does that, but note that it does
> not change ‘guile-2.0/fixed’, which is the Guile we use in all the
> derivations; that one we’ll upgrade in core-updates.

Okay. I noticed you pasted a diff rather than a patch. Will you push the
patch or should one of us?

Re: python-updates

[Leo Famulari]

On Thu, Aug 04, 2016 at 05:23:24PM -0400, Leo Famulari wrote:
> I'd like to upgrade setuptools as well. I should have pushed a patch for
> that in an hour or so.

This is done. Hopefully it all works!

Re: python-updates

[Andreas Enge]

On Thu, Aug 04, 2016 at 05:54:21PM -0400, Leo Famulari wrote:
> On Thu, Aug 04, 2016 at 05:23:24PM -0400, Leo Famulari wrote:
> > I'd like to upgrade setuptools as well. I should have pushed a patch for
> > that in an hour or so.
> This is done. Hopefully it all works!

I added a jobset on hydra:
   http://hydra.gnu.org/jobset/gnu/python-updates

This allowed me to spot a mistake with the setuptools URL, which I corrected;
I will start a new evaluation now.

Andreas

Re: python-updates

[Leo Famulari]

On Fri, Aug 05, 2016 at 02:13:08PM +0200, Andreas Enge wrote:
> On Thu, Aug 04, 2016 at 05:54:21PM -0400, Leo Famulari wrote:
> > On Thu, Aug 04, 2016 at 05:23:24PM -0400, Leo Famulari wrote:
> > > I'd like to upgrade setuptools as well. I should have pushed a patch for
> > > that in an hour or so.
> > This is done. Hopefully it all works!
> 
> I added a jobset on hydra:
>    http://hydra.gnu.org/jobset/gnu/python-updates
> 
> This allowed me to spot a mistake with the setuptools URL, which I corrected;
> I will start a new evaluation now.

Okay, thanks! But, shouldn't we merge master into python-updates first?
The python-updates branch was rather old.

Also, I can do the guile-2.0 update that Ludovic requested.

Re: python-updates

[Leo Famulari]

On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
> Also, I can do the guile-2.0 update that Ludovic requested.

This I pushed as bd21159eba2cce3ca7226faa4772df64df06605d

> Okay, thanks! But, shouldn't we merge master into python-updates first?
> The python-updates branch was rather old.

I did the merge locally, but I can't push the result to Savannah. I
don't get any useful error messages:

$ git push origin python-updates
error: failed to push some refs to 'ssh://lfam@git.sv.gnu.org/srv/git/guix.git'

Re: python-updates

[Andreas Enge]

On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
> Also, I can do the guile-2.0 update that Ludovic requested.

The patch fails to apply:
   http://hydra.gnu.org:3000/build/1405519/nixlog/1/tail-reload
Hopefully it is not needed any more?

Andreas

Re: python-updates

[Mark H Weaver]

Andreas Enge <andreas@enge.fr> writes:

> On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
>> Also, I can do the guile-2.0 update that Ludovic requested.
>
> The patch fails to apply:
>    http://hydra.gnu.org:3000/build/1405519/nixlog/1/tail-reload
> Hopefully it is not needed any more?

guile-arm-fixes.patch should not be needed for guile 2.0.12.

    Thanks,
      Mark

Re: python-updates

[Leo Famulari]

On Fri, Aug 05, 2016 at 05:57:43PM -0400, Mark H Weaver wrote:
> Andreas Enge <andreas@enge.fr> writes:
> 
> > On Fri, Aug 05, 2016 at 11:06:36AM -0400, Leo Famulari wrote:
> >> Also, I can do the guile-2.0 update that Ludovic requested.
> >
> > The patch fails to apply:
> >    http://hydra.gnu.org:3000/build/1405519/nixlog/1/tail-reload
> > Hopefully it is not needed any more?
> 
> guile-arm-fixes.patch should not be needed for guile 2.0.12.

Bah, fixed as fd90ea23548b7492631146b8886a5d38d8819f83.

Sorry for the sloppiness.