[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/12: import: pypi: Deduplicate requirements.
From: |
guix-commits |
Subject: |
05/12: import: pypi: Deduplicate requirements. |
Date: |
Mon, 1 Jul 2019 21:43:02 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit cc9a77cd396f8932bec1b8c7ae9d829ea76f37ec
Author: Maxim Cournoyer <address@hidden>
Date: Thu Mar 28 00:26:01 2019 -0400
import: pypi: Deduplicate requirements.
* guix/import/pypi.scm (parse-requires.txt): Remove potential duplicates.
---
guix/import/pypi.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6a881bd..ad59a8b 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -177,7 +177,11 @@ requirement names."
;; (extra) requirements. Non-optional requirements must appear
;; before any section is defined.
(if (or (eof-object? line) (section-header? line))
- (reverse result)
+ ;; Duplicates can occur, since the same requirement can be
+ ;; listed multiple times with different conditional markers, e.g.
+ ;; pytest >= 3 ; python_version >= "3.3"
+ ;; pytest < 3 ; python_version < "3.3"
+ (reverse (delete-duplicates result))
(cond
((or (string-null? line) (comment? line))
(loop result))
- branch master updated (0f06512 -> 4b60ab8), guix-commits, 2019/07/01
- 03/12: import: pypi: Do not parse optional requirements from source., guix-commits, 2019/07/01
- 02/12: tests: pypi: Mute the output of tar., guix-commits, 2019/07/01
- 06/12: import: pypi: Support more types of archives., guix-commits, 2019/07/01
- 12/12: import: pypi: Preserve package name case when forming pypi-uri., guix-commits, 2019/07/01
- 01/12: import: pypi: Do not consider requirements.txt files., guix-commits, 2019/07/01
- 05/12: import: pypi: Deduplicate requirements.,
guix-commits <=
- 04/12: import: pypi: Improve parsing of requirement specifications., guix-commits, 2019/07/01
- 11/12: import: pypi: Update the host URI., guix-commits, 2019/07/01
- 08/12: import: pypi: Fix typo in docstring., guix-commits, 2019/07/01
- 09/12: import: pypi: Completely mute the output of the "unzip" command., guix-commits, 2019/07/01
- 07/12: import: pypi: Parse wheel METADATA instead of metadata.json., guix-commits, 2019/07/01
- 10/12: import: pypi: Include optional test inputs as native-inputs., guix-commits, 2019/07/01