[PATCH 0/4] Update use of python-enum34

[PATCH 0/4] Update use of python-enum34

[Leo Famulari]

Python-enum34 backports some features of Python 3.4 to earlier versions
of Python.

We now package python-3.4, so I think it's unnecessary to use it in our 
python-3 packages.

This patch series

1) Updates python-3.4 to the latest version that builds with our system.
2) Adds a python2-variant and uses it where necessary.
3) Removes python-enum34 where possible. I checked that all the affected
packages still build.
4) Removes python-setuptools as an input to python-enum34. It doesn't
seem to be necessary anymore.

I think we should keep the python3-variant around in case anyone is
using it "out of tree".

Your thoughts?

Leo Famulari (4):
  gnu: python-enum34: Update to 1.1.0.
  gnu: Add python2-enum34.
  gnu: Don't use python-enum34 when building with python-3.4.
  gnu: python-enum34: Remove python-setuptools from inputs.

 gnu/packages/docker.scm |  1 -
 gnu/packages/python.scm | 18 ++++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

-- 
2.6.3

[PATCH 1/4] gnu: python-enum34: Update to 1.1.0.

[Leo Famulari]

* gnu/packages/python.scm (python-enum34): Update to 1.1.0.
[source]: Use pypi-uri.
---
 gnu/packages/python.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2924237..3e712fc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1311,15 +1311,14 @@ bug tracker.")
 (define-public python-enum34
   (package
     (name "python-enum34")
-    (version "1.0")
+    (version "1.1.0")
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "https://pypi.python.org/packages/source/e/"
-                          "enum34/enum34-" version ".tar.gz"))
+      (uri (pypi-uri "enum34" version))
       (sha256
        (base32
-        "0dg6mpg9n4g9diyrbnbb5vd9d1qw9f265zwhknqy0mxh0cvmjjrq"))))
+        "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp"))))
     (build-system python-build-system)
     (inputs
      `(("python-setuptools" ,python-setuptools)))
-- 
2.6.3

[PATCH 2/4] gnu: Add python2-enum34.

[Leo Famulari]

* gnu/packages/python.scm (python2-enum34): New variable.
(python2-cryptography)[propagated-inputs]: Add python2-enum34.
(python-cryptography)[propagated-inputs]: Remove python-enum34.
---
 gnu/packages/python.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3e712fc..6e1c716 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1335,6 +1335,9 @@ bug tracker.")
 backported for previous versions of Python from 2.4 to 3.3.")
     (license bsd-3)))
 
+(define-public python2-enum34
+  (package-with-python2 python-enum34))
+
 (define-public python-parse-type
   (package
     (name "python-parse-type")
@@ -5792,7 +5795,6 @@ responses, rather than doing any computation.")
      `(("python-cffi" ,python-cffi)
        ("python-six" ,python-six)
        ("python-pyasn1" ,python-pyasn1)
-       ("python-enum34" ,python-enum34)
        ("python-idna" ,python-idna)
        ("python-iso8601" ,python-iso8601)))
     (native-inputs
@@ -5823,6 +5825,7 @@ message digests and key derivation functions.")
        `(("python2-ipaddress" ,python2-ipaddress)
          ("python2-backport-ssl-match-hostname"
           ,python2-backport-ssl-match-hostname)
+         ("python2-enum34" ,python2-enum34)
          ,@(package-propagated-inputs crypto))))))
 
 (define-public python-pyopenssl
-- 
2.6.3

[PATCH 3/4] gnu: Don't use python-enum34 when building with python-3.4.

[Leo Famulari]

* gnu/packages/python.scm (python-parse-type)[inputs]: Remove python-enum34.
(behave)[inputs]: Likewise.
* gnu/packages/docker.scm (docker-compose)[inputs]: Likewise.
---
 gnu/packages/docker.scm | 1 -
 gnu/packages/python.scm | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 06b72ee..0760001 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -90,7 +90,6 @@ client.")
      `(("python-docker-py" ,python-docker-py)
        ("python-dockerpty" ,python-dockerpty)
        ("python-docopt" ,python-docopt)
-       ("python-enum34" ,python-enum34)
        ("python-jsonschema" ,python-jsonschema)
        ("python-pyyaml" ,python-pyyaml)
        ("python-requests" ,python-requests-2.7)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6e1c716..9296cdf 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1354,8 +1354,7 @@ backported for previous versions of Python from 2.4 to 3.3.")
     (inputs
      `(("python-setuptools" ,python-setuptools)
        ("python-six" ,python-six)
-       ("python-parse" ,python-parse)
-       ("python-enum34" ,python-enum34))) ;required for python<3.4
+       ("python-parse" ,python-parse)))
     (arguments '(#:tests? #f))            ;TODO: tests require pytest
     (home-page "https://github.com/jenisys/parse_type")
     (synopsis "Extended parse module")
@@ -2005,7 +2004,6 @@ backported from Python 2.7 for Python 2.4+.")
     (inputs
      `(("python-setuptools" ,python-setuptools)
        ("python-six" ,python-six)
-       ("python-enum43" ,python-enum34)
        ("python-parse" ,python-parse)
        ("python-parse-type" ,python-parse-type)))
     (arguments `(#:tests? #f))          ;TODO: tests require nose>=1.3 and
-- 
2.6.3

[PATCH 4/4] gnu: python-enum34: Remove python-setuptools from inputs.

[Leo Famulari]

* gnu/packages/python.scm (python-enum34)[inputs]: Remove
python-setuptools.
---
 gnu/packages/python.scm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9296cdf..66f911d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1320,8 +1320,6 @@ bug tracker.")
        (base32
         "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp"))))
     (build-system python-build-system)
-    (inputs
-     `(("python-setuptools" ,python-setuptools)))
     (arguments
      `(#:phases
        (alist-replace
-- 
2.6.3

Re: [PATCH 4/4] gnu: python-enum34: Remove python-setuptools from inputs.

[Efraim Flashner]

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

On Sun, 14 Feb 2016 20:44:52 -0500
Leo Famulari <leo@famulari.name> wrote:

> * gnu/packages/python.scm (python-enum34)[inputs]: Remove
> python-setuptools.
> ---
>  gnu/packages/python.scm | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 9296cdf..66f911d 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1320,8 +1320,6 @@ bug tracker.")
>         (base32
>          "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp"))))
>      (build-system python-build-system)
> -    (inputs
> -     `(("python-setuptools" ,python-setuptools)))
>      (arguments
>       `(#:phases
>         (alist-replace

Does this break python2-enum34?

-- 
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: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 2/4] gnu: Add python2-enum34.

[Efraim Flashner]

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

On Sun, 14 Feb 2016 20:44:50 -0500
Leo Famulari <leo@famulari.name> wrote:

> * gnu/packages/python.scm (python2-enum34): New variable.
> (python2-cryptography)[propagated-inputs]: Add python2-enum34.
> (python-cryptography)[propagated-inputs]: Remove python-enum34.
> ---
>  gnu/packages/python.scm | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 3e712fc..6e1c716 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1335,6 +1335,9 @@ bug tracker.")
>  backported for previous versions of Python from 2.4 to 3.3.")
>      (license bsd-3)))
>  
> +(define-public python2-enum34
> +  (package-with-python2 python-enum34))
> +
>  (define-public python-parse-type
>    (package
>      (name "python-parse-type")
> @@ -5792,7 +5795,6 @@ responses, rather than doing any computation.")
>       `(("python-cffi" ,python-cffi)
>         ("python-six" ,python-six)
>         ("python-pyasn1" ,python-pyasn1)
> -       ("python-enum34" ,python-enum34)
>         ("python-idna" ,python-idna)
>         ("python-iso8601" ,python-iso8601)))
>      (native-inputs
> @@ -5823,6 +5825,7 @@ message digests and key derivation functions.")
>         `(("python2-ipaddress" ,python2-ipaddress)
>           ("python2-backport-ssl-match-hostname"
>            ,python2-backport-ssl-match-hostname)
> +         ("python2-enum34" ,python2-enum34)
>           ,@(package-propagated-inputs crypto))))))
>  
>  (define-public python-pyopenssl

I'd move the cryptography change to the next patch, it seems more in line

-- 
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: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 4/4] gnu: python-enum34: Remove python-setuptools from inputs.

[Leo Famulari]

On Thu, Feb 18, 2016 at 10:03:32AM +0200, Efraim Flashner wrote:
> On Sun, 14 Feb 2016 20:44:52 -0500
> Leo Famulari <leo@famulari.name> wrote:
> 
> > * gnu/packages/python.scm (python-enum34)[inputs]: Remove
> > python-setuptools.
> > ---
> >  gnu/packages/python.scm | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index 9296cdf..66f911d 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -1320,8 +1320,6 @@ bug tracker.")
> >         (base32
> >          "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp"))))
> >      (build-system python-build-system)
> > -    (inputs
> > -     `(("python-setuptools" ,python-setuptools)))
> >      (arguments
> >       `(#:phases
> >         (alist-replace
> 
> Does this break python2-enum34?

I don't think so. python2-cryptography still builds, passes it's tests,
and seems to work in "downstream" applications.

I've noticed that the PyPi importer seems to unconditionally add
setuptools as an input (I didn't check the code yet). So, perhaps that
explains it's presence.

Or perhaps the version of python-2 we used at the time (2.7.6) did not
include some setuptools feature that has since been added to the
standard library.

Re: [PATCH 2/4] gnu: Add python2-enum34.

[Leo Famulari]

On Thu, Feb 18, 2016 at 10:03:52AM +0200, Efraim Flashner wrote:
> On Sun, 14 Feb 2016 20:44:50 -0500
> Leo Famulari <leo@famulari.name> wrote:
> 
> > * gnu/packages/python.scm (python2-enum34): New variable.
> > (python2-cryptography)[propagated-inputs]: Add python2-enum34.
> > (python-cryptography)[propagated-inputs]: Remove python-enum34.
> > ---
> >  gnu/packages/python.scm | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index 3e712fc..6e1c716 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -1335,6 +1335,9 @@ bug tracker.")
> >  backported for previous versions of Python from 2.4 to 3.3.")
> >      (license bsd-3)))
> >  
> > +(define-public python2-enum34
> > +  (package-with-python2 python-enum34))
> > +
> >  (define-public python-parse-type
> >    (package
> >      (name "python-parse-type")
> > @@ -5792,7 +5795,6 @@ responses, rather than doing any computation.")
> >       `(("python-cffi" ,python-cffi)
> >         ("python-six" ,python-six)
> >         ("python-pyasn1" ,python-pyasn1)
> > -       ("python-enum34" ,python-enum34)
> >         ("python-idna" ,python-idna)
> >         ("python-iso8601" ,python-iso8601)))
> >      (native-inputs
> > @@ -5823,6 +5825,7 @@ message digests and key derivation functions.")
> >         `(("python2-ipaddress" ,python2-ipaddress)
> >           ("python2-backport-ssl-match-hostname"
> >            ,python2-backport-ssl-match-hostname)
> > +         ("python2-enum34" ,python2-enum34)
> >           ,@(package-propagated-inputs crypto))))))
> >  
> >  (define-public python-pyopenssl
> 
> I'd move the cryptography change to the next patch, it seems more in line

Good point, I did find the structure of the commits to be awkward.

> 
> -- 
> 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

Re: [PATCH 4/4] gnu: python-enum34: Remove python-setuptools from inputs.

[Leo Famulari]

On Thu, Feb 18, 2016 at 12:56:05PM -0500, Leo Famulari wrote:
> On Thu, Feb 18, 2016 at 10:03:32AM +0200, Efraim Flashner wrote:
> > On Sun, 14 Feb 2016 20:44:52 -0500
> > Leo Famulari <leo@famulari.name> wrote:
> > 
> > > * gnu/packages/python.scm (python-enum34)[inputs]: Remove
> > > python-setuptools.
> > > ---
> > >  gnu/packages/python.scm | 2 --
> > >  1 file changed, 2 deletions(-)
> > > 
> > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > > index 9296cdf..66f911d 100644
> > > --- a/gnu/packages/python.scm
> > > +++ b/gnu/packages/python.scm
> > > @@ -1320,8 +1320,6 @@ bug tracker.")
> > >         (base32
> > >          "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp"))))
> > >      (build-system python-build-system)
> > > -    (inputs
> > > -     `(("python-setuptools" ,python-setuptools)))
> > >      (arguments
> > >       `(#:phases
> > >         (alist-replace
> > 
> > Does this break python2-enum34?
> 
> I don't think so. python2-cryptography still builds, passes it's tests,
> and seems to work in "downstream" applications.
> 
> I've noticed that the PyPi importer seems to unconditionally add
> setuptools as an input (I didn't check the code yet). So, perhaps that
> explains it's presence.
> 
> Or perhaps the version of python-2 we used at the time (2.7.6) did not
> include some setuptools feature that has since been added to the
> standard library.

Also, python-enum34 still builds with this change.

Re: [PATCH 4/4] gnu: python-enum34: Remove python-setuptools from inputs.

[Leo Famulari]

On Thu, Feb 18, 2016 at 10:03:32AM +0200, Efraim Flashner wrote:
> On Sun, 14 Feb 2016 20:44:52 -0500
> Leo Famulari <leo@famulari.name> wrote:
> 
> > * gnu/packages/python.scm (python-enum34)[inputs]: Remove
> > python-setuptools.
> > ---
> >  gnu/packages/python.scm | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index 9296cdf..66f911d 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -1320,8 +1320,6 @@ bug tracker.")
> >         (base32
> >          "0yx1m4564wxgbm4glb3457hi16xihd9w63rv13y2przkdir9dfgp"))))
> >      (build-system python-build-system)
> > -    (inputs
> > -     `(("python-setuptools" ,python-setuptools)))
> >      (arguments
> >       `(#:phases
> >         (alist-replace
> 
> Does this break python2-enum34?


I built letsencrypt, which depends on python2-enum34 via
python2-cryptography, on this branch and successfully renewed my certs
with it.

If there are no other concerns about these patches, I'd like to apply
them soon.

> 
> -- 
> 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

Re: [PATCH 4/4] gnu: python-enum34: Remove python-setuptools from inputs.

[Efraim Flashner]

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

On Sun, 21 Feb 2016 00:49:35 -0500
Leo Famulari <leo@famulari.name> wrote:

> On Thu, Feb 18, 2016 at 10:03:32AM +0200, Efraim Flashner wrote:
>  [...]  
>  [...]  
>  [...]  
> 
> 
> I built letsencrypt, which depends on python2-enum34 via
> python2-cryptography, on this branch and successfully renewed my certs
> with it.
> 
> If there are no other concerns about these patches, I'd like to apply
> them soon.
> 
>  [...]  
> 
> 

LGTM!

-- 
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: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]