[PATCH 0/3] guix import pypi: trivial fixes.

[PATCH 0/3] guix import pypi: trivial fixes.

[Cyril Roelandt]

Hello,

These three patches fix small issues with the Pypi importer.

WDYT ?

Cyril.
---
Cyril Roelandt (3):
  guix import pypi: add the Apache License 2.0
  guix import pypi: do not add "python-" to a package name if it's
    already there.
  guix import pypi: Fix a type in a docstring.

 guix/import/pypi.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

-- 
1.8.4.rc3

[PATCH 1/3] guix import pypi: add the Apache License 2.0

[Cyril Roelandt]

* guix/import/pypi.scm (string->license): add ASL2.0.
---
 guix/import/pypi.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index d0e776e..8f5e031 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -85,6 +85,7 @@ recursively apply the procedure to the sub-list."
    ((or "BSD" "BSD License") bsd-3)
    ((or "MIT" "MIT license" "Expat license") expat)
    ("Public domain" public-domain)
+   ("Apache License, Version 2.0" asl2.0)
    (_ #f)))
 
 (define (url-fetch url file-name)
@@ -151,7 +152,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
                             (,gpl3 . gpl3)
                             (,bsd-3 . bsd-3)
                             (,expat . expat)
-                            (,public-domain . public-domain))
+                            (,public-domain . public-domain)
+                            (,asl2.0 . asl2.0))
                           license))))
 
 (define (pypi->guix-package package-name)
-- 
1.8.4.rc3

[PATCH 2/3] guix import pypi: do not add "python-" to a package name if it's already there.

[Cyril Roelandt]

* guix/import/pypi.scm (make-pypi-sexp): test whether the package name starts
  with "python-" before modifying it.
---
 guix/import/pypi.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 8f5e031..722ad9d 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -134,7 +134,9 @@ underscores."
   "Return the `package' s-expression for a python package with the given NAME,
 VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
   `(package
-     (name ,(string-append "python-" (snake-case name)))
+     (name ,(if (eq? (string-contains name "python-") 0)
+                (snake-case name)
+                (string-append "python-" (snake-case name))))
      (version ,version)
      (source (origin
                (method url-fetch)
-- 
1.8.4.rc3

[PATCH 3/3] guix import pypi: Fix a type in a docstring.

[Cyril Roelandt]

* guix/import/pypi.scm (snake-case): Fix documentation.
---
 guix/import/pypi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 722ad9d..12abbac 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -117,8 +117,8 @@ recursively apply the procedure to the sub-list."
                (assoc-ref* pypi-package "info" "version")))))
 
 (define (snake-case str)
-  "Return a downcased version of the string STR where dashes are replaced with
-underscores."
+  "Return a downcased version of the string STR where underscores are replaced
+with dashes."
   (string-join (string-split (string-downcase str) #\_) "-"))
 
 (define (guix-hash-url url)
-- 
1.8.4.rc3

Re: [PATCH 1/3] guix import pypi: add the Apache License 2.0

[David Thompson]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * guix/import/pypi.scm (string->license): add ASL2.0.
> ---
>  guix/import/pypi.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
> index d0e776e..8f5e031 100644
> --- a/guix/import/pypi.scm
> +++ b/guix/import/pypi.scm
> @@ -85,6 +85,7 @@ recursively apply the procedure to the sub-list."
>     ((or "BSD" "BSD License") bsd-3)
>     ((or "MIT" "MIT license" "Expat license") expat)
>     ("Public domain" public-domain)
> +   ("Apache License, Version 2.0" asl2.0)
>     (_ #f)))
>  
>  (define (url-fetch url file-name)
> @@ -151,7 +152,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>                              (,gpl3 . gpl3)
>                              (,bsd-3 . bsd-3)
>                              (,expat . expat)
> -                            (,public-domain . public-domain))
> +                            (,public-domain . public-domain)
> +                            (,asl2.0 . asl2.0))
>                            license))))
>  
>  (define (pypi->guix-package package-name)
> -- 
> 1.8.4.rc3
>
>

Looks good.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 2/3] guix import pypi: do not add "python-" to a package name if it's already there.

[David Thompson]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * guix/import/pypi.scm (make-pypi-sexp): test whether the package name starts
>   with "python-" before modifying it.
> ---
>  guix/import/pypi.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
> index 8f5e031..722ad9d 100644
> --- a/guix/import/pypi.scm
> +++ b/guix/import/pypi.scm
> @@ -134,7 +134,9 @@ underscores."
>    "Return the `package' s-expression for a python package with the given NAME,
>  VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>    `(package
> -     (name ,(string-append "python-" (snake-case name)))
> +     (name ,(if (eq? (string-contains name "python-") 0)

Could we do a regexp match instead?

> +                (snake-case name)
> +                (string-append "python-" (snake-case name))))
>       (version ,version)
>       (source (origin
>                 (method url-fetch)
> -- 
> 1.8.4.rc3
>
>

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 3/3] guix import pypi: Fix a type in a docstring.

[David Thompson]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * guix/import/pypi.scm (snake-case): Fix documentation.
> ---
>  guix/import/pypi.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
> index 722ad9d..12abbac 100644
> --- a/guix/import/pypi.scm
> +++ b/guix/import/pypi.scm
> @@ -117,8 +117,8 @@ recursively apply the procedure to the sub-list."
>                 (assoc-ref* pypi-package "info" "version")))))
>  
>  (define (snake-case str)
> -  "Return a downcased version of the string STR where dashes are replaced with
> -underscores."
> +  "Return a downcased version of the string STR where underscores are replaced
> +with dashes."
>    (string-join (string-split (string-downcase str) #\_) "-"))
>  
>  (define (guix-hash-url url)
> -- 
> 1.8.4.rc3
>
>

Oops!  Looks good.

Thanks for these patches!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 0/3] guix import pypi: trivial fixes.

[Ian Denhardt]

[-- Attachment #1: Type: text/plain, Size: 129 bytes --]

Quoting Cyril Roelandt (2014-10-15 18:49:11)
>   guix import pypi: Fix a type in a docstring.

Was this supposed to be typo?

[-- Attachment #2: signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAABAgAGBQJUPzU7AAoJEPZUuMfUyjy43aAP/Ag9WmBUgxl/CwJXwgHPB9kd
d35crRvR/LktxvQZ/GQZkvvWKxsWkCPOtm0zBmRAq0+vKft1LQP8zbgxEdB1+HHC
k9zBNVYKUGzgkg15JJlP/drt7OvVVCPK+4f8MMDYMgOTLYdHmrR7il24Ado1SqHd
f6SaZiLtDbH/4hZe5h6EIGpEoJQ6t8REFIrDlaDyIINxHmJt0fjprhGpdt3xqmz8
paJPHIW/arlxOsqjkYfSh8XENWX9IpDmjv/hv2UXcroWUdpch72R5HrfxOLB/mdV
upCOiZWLUC6Pcy2VnOVR2jZqcbKAkC7qf34f7MK8u8lOx/q+49X+Y4ePGFzFinDt
2wTwozlSFWywUVyvB4IOxCK3CqcILlfZEVV2nbZEJ8aE+nJQsohEakEUuhhEIJUB
Otdulhx3MAeqijvg8iP0JF3AuAqMN+KD7jToFNNEj9YuH6XHTxNS4qyORr3kiHWs
rr6VsKqE1yi++GLlGNvEBzRwR1uIl+6+fxTQ5kFvJwiUyjhA8rXat8DPC4I1M5pz
A2HJG7B5U2lqvc9VzuUUR9wFuoVHwzH590x3GuW3eAlvrocsmIbOnS9vnRTFLWJa
oVYxM+lCj7w0+yeMf3NpJVSJQLntAhps+/2FKEv3lt6YljEcKJb0/VZQZkrG8prb
PPLVaLtAlKPwMxD/rBWL
=NNH4
-----END PGP SIGNATURE-----

Re: [PATCH 2/3] guix import pypi: do not add "python-" to a package name if it's already there.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> Cyril Roelandt <tipecaml@gmail.com> writes:
>
>> * guix/import/pypi.scm (make-pypi-sexp): test whether the package name starts
>>   with "python-" before modifying it.
>> ---
>>  guix/import/pypi.scm | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
>> index 8f5e031..722ad9d 100644
>> --- a/guix/import/pypi.scm
>> +++ b/guix/import/pypi.scm
>> @@ -134,7 +134,9 @@ underscores."
>>    "Return the `package' s-expression for a python package with the given NAME,
>>  VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>>    `(package
>> -     (name ,(string-append "python-" (snake-case name)))
>> +     (name ,(if (eq? (string-contains name "python-") 0)
>
> Could we do a regexp match instead?

Or (string-prefix? "python-" name) maybe?

Ludo’.

Re: [PATCH 2/3] guix import pypi: do not add "python-" to a package name if it's already there.

[Thompson, David]

On Thu, Oct 16, 2014 at 3:47 AM, Ludovic Courtès <ludo@gnu.org> wrote:
> David Thompson <dthompson2@worcester.edu> skribis:
>
>> Cyril Roelandt <tipecaml@gmail.com> writes:
>>
>>> * guix/import/pypi.scm (make-pypi-sexp): test whether the package name starts
>>>   with "python-" before modifying it.
>>> ---
>>>  guix/import/pypi.scm | 4 +++-
>>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
>>> index 8f5e031..722ad9d 100644
>>> --- a/guix/import/pypi.scm
>>> +++ b/guix/import/pypi.scm
>>> @@ -134,7 +134,9 @@ underscores."
>>>    "Return the `package' s-expression for a python package with the given NAME,
>>>  VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
>>>    `(package
>>> -     (name ,(string-append "python-" (snake-case name)))
>>> +     (name ,(if (eq? (string-contains name "python-") 0)
>>
>> Could we do a regexp match instead?
>
> Or (string-prefix? "python-" name) maybe?

Cool, didn't know about that one.

- Dave

Re: [PATCH 0/3] guix import pypi: trivial fixes.

[Cyril Roelandt]

On 10/16/2014 05:02 AM, Ian Denhardt wrote:
> Quoting Cyril Roelandt (2014-10-15 18:49:11)
>>   guix import pypi: Fix a type in a docstring.
> 
> Was this supposed to be typo?
> 

Yep. That is quite funny. I'll fix that, thanks!

Cyril.