From: Cyril Roelandt <tipecaml@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 03/12] import: pypi: Use "pypi-uri" instead of building the URL manually.
Date: Mon, 12 Oct 2015 23:40:59 +0200 [thread overview]
Message-ID: <1444686068-7668-4-git-send-email-tipecaml@gmail.com> (raw)
In-Reply-To: <1444686068-7668-1-git-send-email-tipecaml@gmail.com>
* guix/import/pypi.scm (make-pypi-sexp): Use "pypi-uri".
* tests/pypi.scm: Update the tests accordingly.
---
guix/import/pypi.scm | 2 +-
tests/pypi.scm | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index d04a685..647ef61 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -165,7 +165,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
(version ,version)
(source (origin
(method url-fetch)
- (uri (string-append ,@(factorize-uri source-url version)))
+ (uri (pypi-uri ,name version))
(sha256
(base32
,(guix-hash-url temp)))))
diff --git a/tests/pypi.scm b/tests/pypi.scm
index c772474..960b8cd 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -84,8 +84,7 @@ baz > 13.37")
('version "1.0.0")
('source ('origin
('method 'url-fetch)
- ('uri ('string-append "https://example.com/foo-"
- 'version ".tar.gz"))
+ ('uri (pypi-uri "foo" version))
('sha256
('base32
(? string? hash)))))
--
2.1.4
next prev parent reply other threads:[~2015-10-12 21:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 21:40 [PATCH 00/12] Tons of patches to run "guix-tox" on python-keystoneclient! Cyril Roelandt
2015-10-12 21:40 ` [PATCH 01/12] guix: download: properly detect https when mirror:// is used Cyril Roelandt
2015-10-16 10:14 ` Ludovic Courtès
2015-10-20 15:57 ` Cyril Roelandt
2015-10-20 16:26 ` Cyril Roelandt
2015-10-12 21:40 ` [PATCH 02/12] guix: Add a "pypi-uri" helper method Cyril Roelandt
2015-10-13 7:47 ` Ricardo Wurmus
2015-10-13 13:51 ` Thompson, David
2015-10-13 23:14 ` Cyril Roelandt
2015-10-12 21:40 ` Cyril Roelandt [this message]
2015-10-25 21:47 ` [PATCH 03/12] import: pypi: Use "pypi-uri" instead of building the URL manually Cyril Roelandt
2015-10-27 17:28 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 04/12] gnu: Update python-requests Cyril Roelandt
2015-10-16 12:32 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 05/12] gnu: Add python-mccabe 0.2.1 Cyril Roelandt
2015-10-16 12:33 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 06/12] gnu: Add python-flake8-2.2.4 Cyril Roelandt
2015-10-16 12:33 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 07/12] gnu: Add python-hacking Cyril Roelandt
2015-10-16 12:37 ` Ludovic Courtès
2016-10-24 20:59 ` Leo Famulari
2015-10-12 21:41 ` [PATCH 08/12] gnu: Add python-oslosphinx Cyril Roelandt
2015-10-16 12:38 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 09/12] gnu: Add python-os-testr Cyril Roelandt
2015-10-16 12:39 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 10/12] gnu: paramiko: Move python-pycrypto to the propagated inputs Cyril Roelandt
2015-10-16 12:40 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 11/12] gnu: Add python-oslo.log Cyril Roelandt
2015-10-16 12:41 ` Ludovic Courtès
2015-10-12 21:41 ` [PATCH 12/12] gnu: Add python-tempest-lib Cyril Roelandt
2015-10-16 12:42 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444686068-7668-4-git-send-email-tipecaml@gmail.com \
--to=tipecaml@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.