[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] import: pypi: Move runtime dependencies to the propagated-in
From: |
Cyril Roelandt |
Subject: |
[PATCH 1/5] import: pypi: Move runtime dependencies to the propagated-inputs. |
Date: |
Sat, 16 Jul 2016 17:23:21 +0200 |
* guix/import/pypi.scm (maybe-inputs): Pass INPUT-TYPE as a parameter.
* guix/import/pypi.scm (make-pypi-sexp): Use this parameter.
* tests/pypi.scm ("pypi->guix-package", "pypi->guix-package, wheels"): Update
accordingly.
---
guix/import/pypi.scm | 9 +++++----
tests/pypi.scm | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index efa6908..474974b 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -103,14 +103,14 @@ package on PyPI."
((name version _ ...)
(string-append name "-" version ".dist-info"))))
-(define (maybe-inputs package-inputs)
- "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
+(define (maybe-inputs input-type package-inputs)
+ "Given a list of PACKAGE-INPUTS, tries to generate the INPUT-TYPE field of a
package definition."
(match package-inputs
(()
'())
((package-inputs ...)
- `((inputs (,'quasiquote ,package-inputs))))))
+ `((,input-type (,'quasiquote ,package-inputs))))))
(define (guess-requirements source-url wheel-url tarball)
"Given SOURCE-URL, WHEEL-URL and a TARBALL of the package, return a list of
@@ -266,7 +266,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and
LICENSE."
(base32
,(guix-hash-url temp)))))
(build-system python-build-system)
- ,@(maybe-inputs (compute-inputs source-url wheel-url temp))
+ ,@(maybe-inputs 'propagated-inputs
+ (compute-inputs source-url wheel-url temp))
(home-page ,home-page)
(synopsis ,synopsis)
(description ,description)
diff --git a/tests/pypi.scm b/tests/pypi.scm
index 379c288..ef43d50 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -106,7 +106,7 @@ baz > 13.37")
('base32
(? string? hash)))))
('build-system 'python-build-system)
- ('inputs
+ ('propagated-inputs
('quasiquote
(("python-bar" ('unquote 'python-bar))
("python-baz" ('unquote 'python-baz))
@@ -166,7 +166,7 @@ baz > 13.37")
('base32
(? string? hash)))))
('build-system 'python-build-system)
- ('inputs
+ ('propagated-inputs
('quasiquote
(("python-bar" ('unquote 'python-bar))
("python-baz" ('unquote 'python-baz))
--
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