unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [v2 3/4] gnu: Don't use python-enum34 when building with python-3.4.
Date: Thu, 18 Feb 2016 13:07:48 -0500	[thread overview]
Message-ID: <6f28c0d677ca74c3b4df739e50bf2308f0787512.1455818819.git.leo@famulari.name> (raw)
In-Reply-To: <cover.1455818819.git.leo@famulari.name>
In-Reply-To: <cover.1455818819.git.leo@famulari.name>

* 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

  parent reply	other threads:[~2016-02-18 18:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-18 18:07 [v2 0/4] Update use of python-enum34 Leo Famulari
2016-02-18 18:07 ` [v2 1/4] gnu: python-enum34: Update to 1.1.0 Leo Famulari
2016-02-18 18:07 ` [v2 2/4] gnu: Add python2-enum34 Leo Famulari
2016-02-18 18:07 ` Leo Famulari [this message]
2016-02-18 18:07 ` [v2 4/4] gnu: python-enum34: Remove python-setuptools from inputs Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6f28c0d677ca74c3b4df739e50bf2308f0787512.1455818819.git.leo@famulari.name \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).