bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-16 Thread Ricardo Wurmus
Maxim Cournoyer writes: >> This allows you to match “eof-object” and '() directly. Whenever I see >> “string-null?” I think it might be better to “match” on the empty list >> directly. > > string-null? and an empty list are not the same, unless I'm missing something. Yes, sorry, I meant “null

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-16 Thread Maxim Cournoyer
Hey Ricardo :-) Ricardo Wurmus writes: > Hi Maxim, > (call-with-input-file requires.txt (lambda (port) - (let loop ((result '())) + (let loop ((required-deps '()) + (test-deps '()) + (inside-test-section? #f) +

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-16 Thread Maxim Cournoyer
Hello! Continued feedback about your much appreciated comments! :-) Ricardo Wurmus writes: > Maxim Cournoyer writes: > + ;; (extra) requirements. Non-optional requirements must appear + ;; before any section is defined. + (if (or (eof-object? line) (s

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-15 Thread Maxim Cournoyer
Hi again, Ricardo Wurmus writes: > Maxim Cournoyer writes: > >> While I agree that a regexp is a bigger hammer than basic string >> manipulation, I see some merit to it here: >> >> 1) We can be assured of conformance with upstream, again, per PEP-0508. >> 2) It is easier to extend; we might wan

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-15 Thread Maxim Cournoyer
Ricardo Wurmus writes: > And finally: Number 9! Yay! >> From 1290f9d1f0d594fdd4723d76b94116be25da9dd5 Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Sat, 30 Mar 2019 20:27:35 -0400 >> Subject: [PATCH 9/9] import: pypi: Preserve package name case when forming >> pypi-uri. >> >> Fix

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-15 Thread Maxim Cournoyer
Hello Ricardo! Ricardo Wurmus writes: >> From cfde6e09f8f8c692fe252d76ed27e8c50a9e5377 Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Sat, 30 Mar 2019 23:13:26 -0400 >> Subject: [PATCH 8/9] import: pypi: Scan source archive to find requires.txt >> file. > >> * guix/import/pypi.scm

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-11 Thread Ricardo Wurmus
Hi Maxim, >>>(call-with-input-file requires.txt >>> (lambda (port) >>> - (let loop ((result '())) >>> + (let loop ((required-deps '()) >>> + (test-deps '()) >>> + (inside-test-section? #f) >>> + (optional? #f)) >>> (let

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-11 Thread Maxim Cournoyer
Ricardo Wurmus writes: > Next up: Seven of Nine, tertiary adjunct of unimatrix zero one: Ehe! I had to look up the reference; I'm not much of a Star Trek fan obviously :-P. >> From 37e499d5d5d5f690aa0a065c730e13f6a31dd30d Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Thu, 28 Mar 2

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-11 Thread Ricardo Wurmus
Hi Maxim, >>> + (call-with-input-file metadata >>> +(lambda (port) >>> + (let loop ((requirements '())) >>> +(let ((line (read-line port))) >>> + ;; Stop at the first 'Provides-Extra' section: the non-optional >>> + ;; requirements appear before the optional o

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-10 Thread Maxim Cournoyer
Hello! Ricardo Wurmus writes: > Patch number 6: > >> From fb0547ef225103c0f8355a7eccc41e0d028f6563 Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Thu, 28 Mar 2019 00:26:03 -0400 >> Subject: [PATCH 6/9] import: pypi: Parse wheel METADATA instead of >> metadata.json. > >> With newer

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-10 Thread Ricardo Wurmus
Hi Maxim, thanks for your patience in addressing my comments. I appreciate it! >> 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 t

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-10 Thread Maxim Cournoyer
Hello again! Ricardo Wurmus writes: > On to the next: > >> From 73e27235cac1275ba7671fd2364325cf5788cb3c Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Thu, 28 Mar 2019 00:26:02 -0400 >> Subject: [PATCH 5/9] import: pypi: Support more types of archives. >> >> This change enables the

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-10 Thread Ricardo Wurmus
Maxim Cournoyer writes: >>> + ;; (extra) requirements. Non-optional requirements must appear >>> + ;; before any section is defined. >>> + (if (or (eof-object? line) (section-header? line)) >>> + (reverse result) >>> + (cond >>> +

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-10 Thread Ricardo Wurmus
Maxim Cournoyer writes: > While I agree that a regexp is a bigger hammer than basic string > manipulation, I see some merit to it here: > > 1) We can be assured of conformance with upstream, again, per PEP-0508. > 2) It is easier to extend; we might want to add parsing for the version > spec in

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-10 Thread Maxim Cournoyer
Hello! Ricardo Wurmus writes: > Patch number 3! Yay! >> From 0c62b541a3e8925b5ca31fe55dbe7536cf95151f Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Thu, 28 Mar 2019 00:26:01 -0400 >> Subject: [PATCH 3/9] import: pypi: Improve parsing of requirement >> specifications. >> >> The p

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-09 Thread Maxim Cournoyer
Hello again! Ricardo Wurmus writes: > Hi Maxim, > > on to patch number 2! Yay! >> From 5f79b0502f62bd1dacc8ea143c1dbd9ef7cfc29d Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Thu, 28 Mar 2019 00:26:00 -0400 >> Subject: [PATCH 2/9] import: pypi: Do not parse optional requirements f

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-06-09 Thread Maxim Cournoyer
Hello Ricardo! Ricardo Wurmus writes: > Hi Maxim, > >> Subject: [PATCH 1/9] import: pypi: Do not consider requirements.txt files. >> >> * guix/import/pypi.scm (guess-requirements): Update comment. >> [guess-requirements-from-source]: Do not attempt to parse the file >> requirements.txt. Streaml

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-29 Thread Maxim Cournoyer
Hello Ricardo! Ricardo Wurmus writes: > And finally: Number 9! > >> From 1290f9d1f0d594fdd4723d76b94116be25da9dd5 Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Sat, 30 Mar 2019 20:27:35 -0400 >> Subject: [PATCH 9/9] import: pypi: Preserve package name case when forming >> pypi-uri

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-28 Thread Ricardo Wurmus
And finally: Number 9! > From 1290f9d1f0d594fdd4723d76b94116be25da9dd5 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Sat, 30 Mar 2019 20:27:35 -0400 > Subject: [PATCH 9/9] import: pypi: Preserve package name case when forming > pypi-uri. > > Fixes issue: #33046. Please change this to

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-28 Thread Ricardo Wurmus
> From cfde6e09f8f8c692fe252d76ed27e8c50a9e5377 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Sat, 30 Mar 2019 23:13:26 -0400 > Subject: [PATCH 8/9] import: pypi: Scan source archive to find requires.txt > file. > * guix/import/pypi.scm (use-modules): Use invoke from (guix build uti

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-28 Thread Ricardo Wurmus
Next up: Seven of Nine, tertiary adjunct of unimatrix zero one: > From 37e499d5d5d5f690aa0a065c730e13f6a31dd30d Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Thu, 28 Mar 2019 23:12:26 -0400 > Subject: [PATCH 7/9] import: pypi: Include optional test inputs as > native-inputs. > > * gui

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-28 Thread Ricardo Wurmus
Patch number 6: > From fb0547ef225103c0f8355a7eccc41e0d028f6563 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Thu, 28 Mar 2019 00:26:03 -0400 > Subject: [PATCH 6/9] import: pypi: Parse wheel METADATA instead of > metadata.json. > With newer Wheel releases, there is no more metadata.j

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-28 Thread Ricardo Wurmus
On to the next: > From 73e27235cac1275ba7671fd2364325cf5788cb3c Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > 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 sou

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-27 Thread Ricardo Wurmus
> From 76e4a3150f8126e0b952c6129b6e1371afba80c0 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Thu, 28 Mar 2019 00:26:01 -0400 > Subject: [PATCH 4/9] import: pypi: Deduplicate requirements. > > * guix/import/pypi.scm (parse-requires.txt): Remove potential duplicates. This looks fine to

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-27 Thread Ricardo Wurmus
Patch number 3! > From 0c62b541a3e8925b5ca31fe55dbe7536cf95151f Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Thu, 28 Mar 2019 00:26:01 -0400 > Subject: [PATCH 3/9] import: pypi: Improve parsing of requirement > specifications. > > The previous solution was fragile and could leave unw

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-27 Thread Ricardo Wurmus
Hi Maxim, on to patch number 2! > From 5f79b0502f62bd1dacc8ea143c1dbd9ef7cfc29d Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > Date: Thu, 28 Mar 2019 00:26:00 -0400 > Subject: [PATCH 2/9] import: pypi: Do not parse optional requirements from > source. > > * guix/import/pypi.scm: Export PARS

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-27 Thread Ricardo Wurmus
Hi Maxim, > Subject: [PATCH 1/9] import: pypi: Do not consider requirements.txt files. > > * guix/import/pypi.scm (guess-requirements): Update comment. > [guess-requirements-from-source]: Do not attempt to parse the file > requirements.txt. Streamline logic. Why remove the handling of the requ

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-21 Thread Maxim Cournoyer
Greetings! Ludovic Courtès writes: > Hello! > > Maxim Cournoyer skribis: > >> Ricardo Wurmus writes: >> >>> Hi Maxim, >>> >>> I would very much like to see your improvements to the pypi importer to >>> be merged. Have you been able to separate the independent changes as >>> suggested by Ludo?

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-20 Thread Ludovic Courtès
Hello! Maxim Cournoyer skribis: > Ricardo Wurmus writes: > >> Hi Maxim, >> >> I would very much like to see your improvements to the pypi importer to >> be merged. Have you been able to separate the independent changes as >> suggested by Ludo? > > I'm thrilled that someone has an interest in t

bug#24450: [PATCHv2] Re: pypi importer outputs strange character series in optional dependency case.

2019-05-19 Thread Maxim Cournoyer
Hi Ricardo! Ricardo Wurmus writes: > Hi Maxim, > > I would very much like to see your improvements to the pypi importer to > be merged. Have you been able to separate the independent changes as > suggested by Ludo? I'm thrilled that someone has an interest in this :-) I took my time, but fina