From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 24450@debbugs.gnu.org
Subject: bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.
Date: Tue, 28 May 2019 12:23:53 +0200 [thread overview]
Message-ID: <idj36kyand2.fsf@bimsb-sys02.mdc-berlin.net> (raw)
In-Reply-To: <87pnod7ot4.fsf@gmail.com>
On to the next:
> From 73e27235cac1275ba7671fd2364325cf5788cb3c Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Thu, 28 Mar 2019 00:26:02 -0400
> Subject: [PATCH 5/9] import: pypi: Support more types of archives.
>
> This change enables the PyPI importer to look for requirements in a source
> archive of a different type than "tar.gz" or "tar.bz2".
Okay.
> * guix/import/pypi.scm: (guess-requirements)[tarball-directory]: Rename to...
> [archive-root-directory]: this. Use COMPRESSED-FILED? to determine if an
> archive is supported or not.
Nitpick: please use “...this.” and leave two spaces between sentences.
Typo: it should be COMPRESSED-FILE?
> [guess-requirements-from-source]: Adapt to use the new method, and use unzip
> to extract ZIP archives.
s/method/procedure/
Please also mention that “compute-inputs” has been adjusted.
> - (define (tarball-directory url)
> - ;; Given the URL of the package's tarball, return the name of the directory
> + (define (archive-root-directory url)
> + ;; Given the URL of the package's archive, return the name of the directory
> ;; that will be created upon decompressing it. If the filetype is not
> ;; supported, return #f.
> - ;; TODO: Support more archive formats.
> - (let ((basename (substring url (+ 1 (string-rindex url #\/)))))
> - (cond
> - ((string-suffix? ".tar.gz" basename)
> - (string-drop-right basename 7))
> - ((string-suffix? ".tar.bz2" basename)
> - (string-drop-right basename 8))
> - (else
> + (if (compressed-file? url)
> + (let ((root-directory (file-sans-extension (basename url))))
> + (if (string=? "tar" (file-extension root-directory))
> + (file-sans-extension root-directory)
> + root-directory))
> (begin
> - (warning (G_ "Unsupported archive format: \
> -cannot determine package dependencies"))
> - #f)))))
> + (warning (G_ "Unsupported archive format (~a): \
> +cannot determine package dependencies") (file-extension url))
> + #f)))
I think the double application of file-sans-extension and the
intermediate variable name “root-directory” for something that is a file
is a little confusing, but I don’t have a better proposal (other than to
replace file-extension and file-sans-extension with a match expression).
> (define (read-wheel-metadata wheel-archive)
> ;; Given WHEEL-ARCHIVE, a ZIP Python wheel archive, return the package's
> @@ -246,16 +243,20 @@ cannot determine package dependencies"))
> (define (guess-requirements-from-source)
> ;; Return the package's requirements by guessing them from the source.
> - (let ((dirname (tarball-directory source-url)))
> + (let ((dirname (archive-root-directory source-url))
> + (extension (file-extension source-url)))
> (if (string? dirname)
> (call-with-temporary-directory
> (lambda (dir)
> (let* ((pypi-name (string-take dirname (string-rindex dirname #\-)))
> (requires.txt (string-append dirname "/" pypi-name
> ".egg-info" "/requires.txt"))
> - (exit-code (parameterize ((current-error-port (%make-void-port "rw+"))
> - (current-output-port (%make-void-port "rw+")))
> - (system* "tar" "xf" tarball "-C" dir requires.txt))))
> + (exit-code
> + (parameterize ((current-error-port (%make-void-port "rw+"))
> + (current-output-port (%make-void-port "rw+")))
> + (if (string=? "zip" extension)
> + (system* "unzip" archive "-d" dir requires.txt)
> + (system* "tar" "xf" archive "-C" dir requires.txt)))))
I guess this is why I’m not too happy with this: we’re checking in
multiple places if the format is supported but then forget about this
again until the next time we need to do something to the file.
I wonder if we could do better and answer the question just once.
--
Ricardo
next prev parent reply other threads:[~2019-05-28 10:24 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 20:00 bug#24450: pypi importer outputs strange character series in optional dependency case ng0
2019-03-29 4:24 ` Maxim Cournoyer
2019-06-16 17:02 ` ng0
2019-06-26 4:12 ` Maxim Cournoyer
2019-03-29 4:34 ` bug#24450: [PATCH] " Maxim Cournoyer
2019-03-30 2:12 ` bug#24450: [PATCHv2] " T460s laptop
2019-03-31 14:40 ` bug#24450: [PATCH] " Maxim Cournoyer
2019-04-01 15:28 ` bug#24450: [PATCHv2] " Ludovic Courtès
2019-05-15 11:06 ` Ricardo Wurmus
2019-05-20 4:05 ` bug#24450: [PATCHv2] " Maxim Cournoyer
2019-05-20 15:05 ` Ludovic Courtès
2019-05-22 1:13 ` Maxim Cournoyer
2019-05-27 14:48 ` Ricardo Wurmus
2019-06-10 2:10 ` Maxim Cournoyer
2019-05-27 15:11 ` Ricardo Wurmus
2019-06-10 3:30 ` Maxim Cournoyer
2019-06-10 9:23 ` Ricardo Wurmus
2019-06-16 14:11 ` Maxim Cournoyer
2019-06-17 1:41 ` Ricardo Wurmus
2019-05-27 15:54 ` Ricardo Wurmus
2019-06-10 8:32 ` Maxim Cournoyer
2019-06-10 9:12 ` Ricardo Wurmus
2019-06-16 6:05 ` Maxim Cournoyer
2019-05-27 15:58 ` Ricardo Wurmus
2019-05-28 10:23 ` Ricardo Wurmus [this message]
2019-06-10 13:30 ` Maxim Cournoyer
2019-06-10 20:13 ` Ricardo Wurmus
2019-05-28 11:04 ` Ricardo Wurmus
2019-06-11 0:39 ` Maxim Cournoyer
2019-06-11 11:56 ` Ricardo Wurmus
2019-05-28 13:21 ` Ricardo Wurmus
2019-05-28 14:48 ` Ricardo Wurmus
2019-06-16 5:10 ` Maxim Cournoyer
2019-05-28 14:53 ` Ricardo Wurmus
2019-05-30 2:24 ` Maxim Cournoyer
2019-06-16 5:53 ` Maxim Cournoyer
2019-06-12 3:00 ` Maxim Cournoyer
2019-06-12 6:39 ` Ricardo Wurmus
2019-06-16 14:29 ` Maxim Cournoyer
2019-06-16 14:36 ` bug#24450: [PATCHv3] " Maxim Cournoyer
2019-07-02 1:54 ` Maxim Cournoyer
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=idj36kyand2.fsf@bimsb-sys02.mdc-berlin.net \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=24450@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
/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.