From fe4a8da4453c7a60fe96d0d4c9c4f8f4cc2c4ca6 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 2 Dec 2016 14:03:12 +0100 Subject: gnu: python-numpydoc: Correct inputs. This does what 213d1745c6adbfd274b1edc575529e026b0ab743 was supposed to do. * gnu/packages/python.scm (python-numpydoc, python-numpydoc) Change first of the duplicate [native-inputs] definitions to [propagated-inputs]. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea94f44230..24df71f338 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3390,7 +3390,7 @@ that client code uses to construct the grammar directly in Python code.") (substitute* "numpydoc/tests/test_plot_directive.py" (("3") "2")))))) (build-system python-build-system) - (native-inputs + (propagated-inputs `(("python-sphinx" ,python-sphinx))) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From 77a6932adf29c1945289ccbdd84dc476c03e6915 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 2 Dec 2016 15:02:30 +0100 Subject: gnu: python2-ipython: Fix inputs. This fixes e62600feb6a3aca2304925ed8c0bb5a9060e38dd, where the inputs have been changed to native-inputs, but still extended from inputs. * gnu/packages/python.scm (python2-ipython)[native-inputs]: Extend from python-ipython's package-native-inputs. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 24df71f338..c2dac25706 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4814,7 +4814,7 @@ computing.") ;; FIXME: add pyreadline once available. (native-inputs `(("python2-mock" ,python2-mock) - ,@(package-inputs ipython)))))) + ,@(package-native-inputs ipython)))))) (define-public python-isodate (package -- cgit v1.2.3 From b0aa6ede251709f650b30020057a86da8c636f99 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Fri, 2 Dec 2016 15:05:19 +0100 Subject: gnu: python-numpy: Fix inputs. This fixes 2efabc5589dc641dce75702b99253a3fb40bb2eb, where some inputs have been changed to propagated-inputs, but the propagated-inputs are still extended from inputs and the inputs are not extended at all. * gnu/packages/python.scm (python-numpy, python2-numpy)[inputs]: Extend from python-numpy-bootstrap's package-inputs. [propagated-inputs]: Extend from python-numpy-bootstrap's package-propagated-inputs. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c2dac25706..e3738696b4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3261,11 +3261,12 @@ association studies (GWAS) on extremely large data sets.") (name "python-numpy") (outputs '("out" "doc")) (inputs - `(("which" ,which))) + `(("which" ,which) + ,@(package-inputs python-numpy-bootstrap))) (propagated-inputs `(("python-matplotlib" ,python-matplotlib) ("python-pyparsing" ,python-pyparsing) - ,@(package-inputs python-numpy-bootstrap))) + ,@(package-propagated-inputs python-numpy-bootstrap))) (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) -- cgit v1.2.3 From a6c4790567824fc9e2a101f4363a680684e5cd30 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 2 Dec 2016 22:29:21 -0500 Subject: gnu: python-cryptography: Update to 1.6. * gnu/packages/python.scm (python-cryptography, python2-cryptography): Update to 1.6. (python-cryptography-vectors, python2-cryptography-vectors): Update to 1.6. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e3738696b4..8f8b0de721 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6372,14 +6372,14 @@ responses, rather than doing any computation.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "1.5.3") + (version "1.6") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "1bnd1bricyhxa27rhr0ljk0kacxzvysd3ar2j2hlv13a2k6zw4z5")))) + "0xgn3yvlmv5rs92wgjj39qscr6s7mwbbsx7j683sfa6ijmyb1k01")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -6394,14 +6394,14 @@ responses, rather than doing any computation.") (define-public python-cryptography (package (name "python-cryptography") - (version "1.5.3") + (version "1.6") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "1raanvkdfw5ai56ymlij6ghc4k126fs7jx948ig7yn4vj6ndv0ng")))) + "0gwvmz6w5ml0bjbgmdiscsv5i948lrjd381z7h9qkz6kr398c3ad")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3