all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#27173: [PATCH] import: pypi: Always use pypi.io URL with downcased package name.
@ 2017-05-31 20:04 Danny Milosavljevic
  2017-06-01 12:06 ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Danny Milosavljevic @ 2017-05-31 20:04 UTC (permalink / raw)
  To: 27173

* guix/import/pypi.scm (make-pypi-sexp): Always use pypi.io URL with
downcased package name.
---
 guix/import/pypi.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 9c72e7331..90dbe5612 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -258,11 +258,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
                        ;; Sometimes 'pypi-uri' doesn't quite work due to mixed
                        ;; cases in NAME, for instance, as is the case with
                        ;; "uwsgi".  In that case, fall back to a full URL.
-                       (uri ,(if (equal? (pypi-uri name version) source-url)
-                                 `(pypi-uri ,name version)
-                                 `(string-append
-                                   ,@(factorize-uri source-url version))))
-
+                       (uri (pypi-uri ,(string-downcase name) version))
                        (sha256
                         (base32
                          ,(guix-hash-url temp)))))

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#27173: [PATCH] import: pypi: Always use pypi.io URL with downcased package name.
  2017-05-31 20:04 bug#27173: [PATCH] import: pypi: Always use pypi.io URL with downcased package name Danny Milosavljevic
@ 2017-06-01 12:06 ` Ludovic Courtès
  2017-06-01 12:14   ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2017-06-01 12:06 UTC (permalink / raw)
  To: Danny Milosavljevic; +Cc: 27173

Hi Danny,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * guix/import/pypi.scm (make-pypi-sexp): Always use pypi.io URL with
> downcased package name.
> ---
>  guix/import/pypi.scm | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
> index 9c72e7331..90dbe5612 100644
> --- a/guix/import/pypi.scm
> +++ b/guix/import/pypi.scm
> @@ -258,11 +258,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>                         ;; Sometimes 'pypi-uri' doesn't quite work due to mixed
>                         ;; cases in NAME, for instance, as is the case with
>                         ;; "uwsgi".  In that case, fall back to a full URL.
> -                       (uri ,(if (equal? (pypi-uri name version) source-url)
> -                                 `(pypi-uri ,name version)
> -                                 `(string-append
> -                                   ,@(factorize-uri source-url version))))
> -
> +                       (uri (pypi-uri ,(string-downcase name) version))

So is the command above outdated?  For instance, does “guix import pypi
uwsgi” work with this change?

If it does, feel free to push after removing the comment.

Thanks,
Ludo’.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#27173: [PATCH] import: pypi: Always use pypi.io URL with downcased package name.
  2017-06-01 12:06 ` Ludovic Courtès
@ 2017-06-01 12:14   ` Ludovic Courtès
  0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2017-06-01 12:14 UTC (permalink / raw)
  To: Danny Milosavljevic; +Cc: 27173

ludo@gnu.org (Ludovic Courtès) skribis:

> Hi Danny,
>
> Danny Milosavljevic <dannym@scratchpost.org> skribis:
>
>> * guix/import/pypi.scm (make-pypi-sexp): Always use pypi.io URL with
>> downcased package name.
>> ---
>>  guix/import/pypi.scm | 6 +-----
>>  1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
>> index 9c72e7331..90dbe5612 100644
>> --- a/guix/import/pypi.scm
>> +++ b/guix/import/pypi.scm
>> @@ -258,11 +258,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>>                         ;; Sometimes 'pypi-uri' doesn't quite work due to mixed
>>                         ;; cases in NAME, for instance, as is the case with
>>                         ;; "uwsgi".  In that case, fall back to a full URL.
>> -                       (uri ,(if (equal? (pypi-uri name version) source-url)
>> -                                 `(pypi-uri ,name version)
>> -                                 `(string-append
>> -                                   ,@(factorize-uri source-url version))))
>> -
>> +                       (uri (pypi-uri ,(string-downcase name) version))
>
> So is the command above outdated?
            ^------
Should read: “the comment.”

Ludo’.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-06-01 12:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-31 20:04 bug#27173: [PATCH] import: pypi: Always use pypi.io URL with downcased package name Danny Milosavljevic
2017-06-01 12:06 ` Ludovic Courtès
2017-06-01 12:14   ` Ludovic Courtès

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.