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

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

[Leo Famulari]

I have restructured the commits as suggested by Efraim.

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

[v2 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 24af2d8..7f49899 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

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

[Leo Famulari]

* gnu/packages/python.scm (python2-enum34): New variable.
---
 gnu/packages/python.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7f49899..c4ce6c5 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")
-- 
2.6.3

[v2 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.
(python-cryptography)[propagated-inputs]: Likewise.
(python2-cryptography)[propagated-inputs]: Add python2-enum34.
* gnu/packages/docker.scm (docker-compose)[inputs]: Remove python-enum34.
---
 gnu/packages/docker.scm | 1 -
 gnu/packages/python.scm | 6 ++----
 2 files changed, 2 insertions(+), 5 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 c4ce6c5..2cae737 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
@@ -5792,7 +5790,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 +5820,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

[v2 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 2cae737..fc946f9 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