[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/17: import: pypi: Emit new-style package inputs.
From: |
guix-commits |
Subject: |
13/17: import: pypi: Emit new-style package inputs. |
Date: |
Sat, 10 Jul 2021 19:07:12 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 52a9a0712abb2a2b02e5747d118fecff95d92366
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jun 30 15:37:28 2021 +0200
import: pypi: Emit new-style package inputs.
* guix/import/pypi.scm (maybe-inputs): Wrap PACKAGE-INPUTS in 'list'
instead of 'quasiquote'.
(compute-inputs)[requirement->package-name/sort]: Return a list of symbols.
* tests/pypi.scm ("pypi->guix-package, no wheel")
("pypi->guix-package, wheels"): Adjust accordingly.
---
guix/import/pypi.scm | 15 ++++-----------
tests/pypi.scm | 18 ++++--------------
2 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6731d50..f3619dc 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès
<ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -183,7 +183,7 @@ the input field."
(()
'())
((package-inputs ...)
- `((,input-type (,'quasiquote ,package-inputs))))))
+ `((,input-type (list ,@package-inputs))))))
(define %requirement-name-regexp
;; Regexp to match the requirement name in a requirement specification.
@@ -402,15 +402,8 @@ return the unaltered list of upstream dependency names."
(remove (cut string=? "argparse" <>) deps))
(define (requirement->package-name/sort deps)
- (sort
- (map (lambda (input)
- (let ((guix-name (python->package-name input)))
- (list guix-name (list 'unquote (string->symbol guix-name)))))
- deps)
- (lambda args
- (match args
- (((a _ ...) (b _ ...))
- (string-ci<? a b))))))
+ (map string->symbol
+ (sort (map python->package-name deps) string-ci<?)))
(define process-requirements
(compose requirement->package-name/sort strip-argparse))
diff --git a/tests/pypi.scm b/tests/pypi.scm
index f421d6d..bb81e91 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -213,13 +213,8 @@ Requires-Dist: pytest (>=3.1.0); extra == 'testing'
('base32
(? string? hash)))))
('build-system 'python-build-system)
- ('propagated-inputs
- ('quasiquote
- (("python-bar" ('unquote 'python-bar))
- ("python-foo" ('unquote 'python-foo)))))
- ('native-inputs
- ('quasiquote
- (("python-pytest" ('unquote 'python-pytest)))))
+ ('propagated-inputs ('list 'python-bar 'python-foo))
+ ('native-inputs ('list 'python-pytest))
('home-page "http://example.com")
('synopsis "summary")
('description "summary")
@@ -282,13 +277,8 @@ Requires-Dist: pytest (>=3.1.0); extra == 'testing'
('base32
(? string? hash)))))
('build-system 'python-build-system)
- ('propagated-inputs
- ('quasiquote
- (("python-bar" ('unquote 'python-bar))
- ("python-baz" ('unquote 'python-baz)))))
- ('native-inputs
- ('quasiquote
- (("python-pytest" ('unquote 'python-pytest)))))
+ ('propagated-inputs ('list 'python-bar 'python-baz))
+ ('native-inputs ('list 'python-pytest))
('home-page "http://example.com")
('synopsis "summary")
('description "summary")
- branch core-updates updated (2a3cd4e -> 9b4c3c6), guix-commits, 2021/07/10
- 01/17: records: Support field sanitizers., guix-commits, 2021/07/10
- 08/17: utils: Add 'go-to-location' with source location caching., guix-commits, 2021/07/10
- 06/17: gnu: Change inputs of core packages to plain lists., guix-commits, 2021/07/10
- 07/17: utils: 'edit-expression' no longer leaks file ports., guix-commits, 2021/07/10
- 14/17: import: cran: Emit new-style package inputs., guix-commits, 2021/07/10
- 13/17: import: pypi: Emit new-style package inputs.,
guix-commits <=
- 10/17: utils: 'edit-expression' copies part of the original source map., guix-commits, 2021/07/10
- 09/17: utils: 'edit-expression' modifies the file only if necessary., guix-commits, 2021/07/10
- 16/17: import: elpa: Emit new-style package inputs., guix-commits, 2021/07/10
- 17/17: news: Add news entry for simplified package inputs., guix-commits, 2021/07/10
- 04/17: packages: Add 'lookup-package-input' & co., guix-commits, 2021/07/10
- 02/17: packages: Allow inputs to be plain package lists., guix-commits, 2021/07/10
- 03/17: lint: Add 'input-labels' checker., guix-commits, 2021/07/10
- 11/17: Add 'guix style'., guix-commits, 2021/07/10
- 05/17: packages: Add 'modify-inputs'., guix-commits, 2021/07/10
- 12/17: packages: 'hidden-package' inherits the original package location., guix-commits, 2021/07/10