[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] import: pypi: Remove setuptools from the inputs.
From: |
Cyril Roelandt |
Subject: |
[PATCH 2/5] import: pypi: Remove setuptools from the inputs. |
Date: |
Sat, 16 Jul 2016 17:23:22 +0200 |
* guix/import/pypi.scm (compute-inputs): remove python-setuptools from the
inputs.
* tests/pypi.scm ("pypi->guix-package", "pypi->guix-package, wheels"): Update
accordingly.
---
guix/import/pypi.scm | 7 +++----
tests/pypi.scm | 6 ++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 474974b..af9b108 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -232,10 +232,9 @@ name/variable pairs describing the required inputs of this
package."
(sort
(map (lambda (input)
(list input (list 'unquote (string->symbol input))))
- (append '("python-setuptools")
- ;; Argparse has been part of Python since 2.7.
- (remove (cut string=? "python-argparse" <>)
- (guess-requirements source-url wheel-url tarball))))
+ ;; Argparse has been part of Python since 2.7.
+ (remove (cut string=? "python-argparse" <>)
+ (guess-requirements source-url wheel-url tarball)))
(lambda args
(match args
(((a _ ...) (b _ ...))
diff --git a/tests/pypi.scm b/tests/pypi.scm
index ef43d50..7f0ad23 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -109,8 +109,7 @@ baz > 13.37")
('propagated-inputs
('quasiquote
(("python-bar" ('unquote 'python-bar))
- ("python-baz" ('unquote 'python-baz))
- ("python-setuptools" ('unquote 'python-setuptools)))))
+ ("python-baz" ('unquote 'python-baz)))))
('home-page "http://example.com")
('synopsis "summary")
('description "summary")
@@ -169,8 +168,7 @@ baz > 13.37")
('propagated-inputs
('quasiquote
(("python-bar" ('unquote 'python-bar))
- ("python-baz" ('unquote 'python-baz))
- ("python-setuptools" ('unquote 'python-setuptools)))))
+ ("python-baz" ('unquote 'python-baz)))))
('home-page "http://example.com")
('synopsis "summary")
('description "summary")
--
2.6.2
[PATCH 4/5] import: pypi: Compute test requirements when reading requirements files., Cyril Roelandt, 2016/07/16
[PATCH 3/5] import: pypi: Compute test requirements when using wheels., Cyril Roelandt, 2016/07/16