[PATCH 0/6] Updated: Some new python packages

[PATCH 0/6] Updated: Some new python packages

[Hartmut Goebel]

Enclosed please find updated patches adding nwe Python packages for both
Python 3 and Python 2. These are needed for run the django test-suite (more to
come).

Changes to the first version of the patches:
tblib: Add comment about why overwriting "check"
tblib: setuptools is native-input only.
tblib: update description.

selenium: Enable tests (well, there are none :-)
selenium: update description: less "advertising."
selenium: description
selenium: Add comment about included pre-build binaries.

maxminddb: update decription

geoip2: setuptools is native import
geoip2: update comments

ipaddr: Update description


Hartmut Goebel (6):
  gnu: Add python-tblib and python2-tblib
  gnu: add python-sqlparse and python2-sqlparse
  gnu: add python-selenium and python2-selenium
  gnu: Add python2-ipaddr, a Python-2-only package
  gnu: add python-maxminddb and python2-maxminddb
  gnu: add python-geoip2 and python2-geoip2

 gnu/packages/python.scm | 210 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)

-- 
2.7.4

[PATCH 1/6] gnu: Add python-tblib and python2-tblib

[Hartmut Goebel]

* packages/python.scm (python-tblib) (python2-tblib): New
  variables.
---
 gnu/packages/python.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0379352..7cb1dc6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -18,6 +18,7 @@
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
+;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8712,3 +8713,47 @@ respectively.")
 (define-public python2-cysignals
   (package-with-python2 python-cysignals))
 
+(define-public python-tblib
+  (package
+    (name "python-tblib")
+    (version "1.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tblib" version))
+       (sha256
+        (base32
+         "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+        (replace 'check
+         ;; Run py.test, excluding some file which are no tests and fail to i
+         ;; mport.  Excluding know problem-files is less intrusive to what
+         ;; upstream has configured to be tested than restricting to only scan
+         ;; directory tests/.
+         (lambda _
+           (zero? (system* "py.test" "--ignore=setup.py"
+                           "--ignore=docs/conf.py"
+                           "--ignore=ci/appveyor-download.py")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-setuptools" ,python-setuptools)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/ionelmc/python-tblib")
+    (synopsis "Traceback serialization library")
+    (description
+     "Traceback serialization allows you to:
+
+@itemize
+@item Pickle tracebacks and raise exceptions with pickled tracebacks in
+different processes. This allows better error handling when running code over
+multiple processes (imagine multiprocessing, billiard, futures, celery etc).
+
+@item Parse traceback strings and raise with the parsed tracebacks.
+@end itemize")
+    (license bsd-3)))
+
+(define-public python2-tblib
+  (package-with-python2 python-tblib))
-- 
2.7.4

[PATCH 2/6] gnu: add python-sqlparse and python2-sqlparse

[Hartmut Goebel]

* gnu/packages/python.scm (python-sqlparse) (python2-sqlparse):
  New variables.
---
 gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7cb1dc6..0241ed5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8757,3 +8757,39 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc).
 
 (define-public python2-tblib
   (package-with-python2 python-tblib))
+
+(define-public python-sqlparse
+  (package
+    (name "python-sqlparse")
+    (version "0.1.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "sqlparse" version))
+       (sha256
+        (base32
+         "1s2fvaxgh9kqzrd6iwy5h7i61ckn05plx9np13zby93z3hdbx5nq"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* _
+             ;; setup.py-integrated 2to3 only affects the build files, but
+             ;; py.test is using the source files. So we need to convert them
+             ;; manually.
+             (if (zero? (system* "python3"))
+                 (system* "2to3" "--no-diff" "-wn" "sqlparse" "tests")
+                 #t)
+             (zero? (system* "py.test")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-setuptools" ,python-setuptools)))
+    (home-page "https://github.com/andialbrecht/sqlparse")
+    (synopsis "Non-validating SQL parser")
+    (description "sqlparse is a non-validating SQL parser for Python.  It
+provides support for parsing, splitting and formatting SQL statements.")
+    (license bsd-3)))
+
+(define-public python2-sqlparse
+  (package-with-python2 python-sqlparse))
-- 
2.7.4

[PATCH 3/6] gnu: add python-selenium and python2-selenium

[Hartmut Goebel]

* gnu/packages/python.scm (python-selenium) (python2-selenium):
  New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0241ed5..3c81a1f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8793,3 +8793,32 @@ provides support for parsing, splitting and formatting SQL statements.")
 
 (define-public python2-sqlparse
   (package-with-python2 python-sqlparse))
+
+(define-public python-selenium
+  (package
+    (name "python-selenium")
+    (version "2.53.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "selenium" version))
+       (sha256
+        (base32
+         "1pj0ci4dxwfa0pkvjc60k7pw74zy6ay473mnzckbb58jlhc994jk"))))
+    (build-system python-build-system)
+    ;; FIXME webdriver/firefox contains pre-build binaries. Build them in
+    ;; guix, but the source is not included.
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://www.seleniumhq.org/")
+    (synopsis "Python bindings for Selenium Webdriver")
+    (description "The @code{selenium} package is used automate web browser
+interaction from Python.  Several browsers/drivers are supported (Firefox,
+Chrome, Internet Explorer, PhantomJS), as well as the Remote protocol.
+
+Primarily it is for automated testing of web applications, but can also used
+for e.g. automating web-based administration tasks.")
+    (license asl2.0)))
+
+(define-public python2-selenium
+  (package-with-python2 python-selenium))
-- 
2.7.4

[PATCH 4/6] gnu: Add python2-ipaddr, a Python-2-only package

[Hartmut Goebel]

* gnu/packages/python.scm: (python2-ipaddr): New variable..
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3c81a1f..cc7e52f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5785,6 +5785,35 @@ IPv6 addresses and networks.  This is a port of the Python 3.3 ipaddress
 module to older versions of Python.")
     (license psfl)))
 
+(define-public python2-ipaddr
+  (package
+    (name "python2-ipaddr")
+    (version "2.1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ipaddr" version))
+       (sha256
+        (base32 "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* _
+             (zero? (system* "python" "ipaddr_test.py")))))))
+    (home-page "https://github.com/google/ipaddr-py")
+    (synopsis "IP address manipulation library by Google")
+    (description
+     "Ipaddr is a Python library for creating and manupilating IPv4 and IPv6
+addresses and networks.
+
+For new implementations you may prefer to use the standard module
+@code{ipaddress}, which was introduced in Python 3.3 and backported to older
+versions of Python.")
+    (license asl2.0)))
+
 (define-public python-idna
   (package
     (name "python-idna")
-- 
2.7.4

[PATCH 5/6] gnu: add python-maxminddb and python2-maxminddb

[Hartmut Goebel]

* gnu/packages/python.scm: (python-maxminddb) (python2-maxminddb):
  New variable.
---
 gnu/packages/python.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cc7e52f..0d07451 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8851,3 +8851,42 @@ for e.g. automating web-based administration tasks.")
 
 (define-public python2-selenium
   (package-with-python2 python-selenium))
+
+(define-public python-maxminddb
+  (package
+    (name "python-maxminddb")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "maxminddb" version))
+       (sha256
+        (base32
+         "1f7smwdn5x3rnjzyl46n7dmxpjis6qkb6akk5w2nnc8ik936rgq0"))))
+    (build-system python-build-system)
+    (arguments
+     ;; tests require a copy of the maxminddb which is not included
+     `(#:tests? #f))
+    (inputs
+     ;; todo: if libmaxmind is available, add it here to get the C-extension
+     `(("python-setuptools" ,python-setuptools)))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "http://www.maxmind.com/")
+    (synopsis "Reader for the MaxMind DB format")
+    (description "MaxMind DB is a binary file format that stores data indexed
+by IP address subnets (IPv4 or IPv6).  This is a Python module for reading
+MaxMind DB files.")
+    ;; todo: currently only the pure-Python reader is build, see above
+    ;; The module includes both a pure Python reader and an
+    ;; optional C extension.")
+    (license asl2.0)
+    (properties `((python2-variant . ,(delay python2-maxminddb))))))
+
+(define-public python2-maxminddb
+  (let ((base (package-with-python2 (strip-python2-variant python-maxminddb))))
+    (package (inherit base)
+      (inputs
+       `(("python2-ipaddr" ,python2-ipaddr)
+         ,@(package-inputs base))))))
+
-- 
2.7.4

[PATCH 6/7] gnu: add comment pointing to python-requests-mock in openstack

[Hartmut Goebel]

I did expect this package to be defined in python.scm.

* gnu/packages/python.scm (python-requests): comment added
---
 gnu/packages/python.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 43e0657..197f236 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2245,6 +2245,10 @@ than Python’s urllib2 library.")
 (define-public python2-requests
   (package-with-python2 python-requests))
 
+;;
+;; Note: python-requests-mock is defined in module gnu packages openstack
+;;
+
 (define-public python-vcversioner
   (package
     (name "python-vcversioner")
-- 
2.7.4

[PATCH 6/6] gnu: add python-geoip2 and python2-geoip2

[Hartmut Goebel]

* gnu/packages/python.scm (python-geoip2) (pythons-geoip2):
  New variables.
---
 gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0d07451..5bf026d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -63,6 +63,7 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages openstack)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -8890,3 +8891,36 @@ MaxMind DB files.")
        `(("python2-ipaddr" ,python2-ipaddr)
          ,@(package-inputs base))))))
 
+(define-public python-geoip2
+  (package
+    (name "python-geoip2")
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "geoip2" version))
+       (sha256
+        (base32
+         "0jxh5p0d2ff1snv9n2xmjib2qw6vz0s2jgcdh69xblfssskgqnr6"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; tests require a copy of the maxmind database
+    (inputs
+     `(("python-maxminddb" ,python-maxminddb) ; >=1.1.0
+       ("python-requests" ,python-requests))) ; >=2.4
+    (native-inputs
+     `(("python-requests-mock" ,python-requests-mock)
+       ("python-six" ,python-six)
+       ("python-setuptools" ,python-setuptools)))
+    (home-page "http://www.maxmind.com/")
+    (synopsis "MaxMind GeoIP2 API")
+    (description "Provides an API for the GeoIP2 web services and databases.
+The API also works with MaxMind’s free GeoLite2 databases.")
+    (license asl2.0)
+    (properties `((python2-variant . ,(delay python2-mayminddb))))))
+
+(define-public python2-geoip2
+  (let ((base (package-with-python2 (strip-python2-variant python-geoip2))))
+    (package (inherit base)
+      (inputs
+       `(("python2-ipaddr" ,python2-ipaddr)
+         ,@(package-inputs base))))))
-- 
2.7.4

[PATCH 7/7] gnu: add python-geoip2 and python2-geoip2

[Hartmut Goebel]

* gnu/packages/python.scm (python-geoip2) (pythons-geoip2):
  New functions.
---
 gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 197f236..330be07 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -63,6 +63,7 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages openstack)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -8889,3 +8890,36 @@ subnets (IPv4 or IPv6).")
        `(("python2-ipaddr" ,python2-ipaddr)
          ,@(package-inputs base))))))
 
+(define-public python-geoip2
+  (package
+    (name "python-geoip2")
+    (version "2.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "geoip2" version))
+       (sha256
+        (base32
+         "0jxh5p0d2ff1snv9n2xmjib2qw6vz0s2jgcdh69xblfssskgqnr6"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; tests require a copy of the database
+    (inputs
+     `(("python-maxminddb" ,python-maxminddb) ; >=1.1.0
+       ("python-requests" ,python-requests) ; >=2.4
+       ("python-setuptools" ,python-setuptools)))
+    (native-inputs
+     `(("python-requests-mock" ,python-requests-mock)
+       ("python-six" ,python-six)))
+    (home-page "http://www.maxmind.com/")
+    (synopsis "MaxMind GeoIP2 API")
+    (description "Provides an API for the GeoIP2 web services and databases.
+The API also works with MaxMind’s free GeoLite2 databases.")
+    (license asl2.0)
+    (properties `((python2-variant . ,(delay python2-mayminddb))))))
+
+(define-public python2-geoip2
+  (let ((base (package-with-python2 (strip-python2-variant python-geoip2))))
+    (package (inherit base)
+      (inputs
+       `(("python2-ipaddr" ,python2-ipaddr)
+         ,@(package-inputs base))))))
-- 
2.7.4

Re: [PATCH 6/6] gnu: add python-geoip2 and python2-geoip2

[Hartmut Goebel]

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

Hi,
> +    (properties `((python2-variant . ,(delay python2-mayminddb))))))

I've just discovered, this line is wrong: Of cource it must be
"python2-geoip2" here. Whoever is committing, please fix it. Thanks.

-- 
Schönen Gruß
Hartmut Goebel
Dipl.-Informatiker (univ), CISSP, CSSLP, ISO 27001 Lead Implementer
Information Security Management, Security Governance, Secure Software
Development

Goebel Consult, Landshut
http://www.goebel-consult.de

Blog:
http://www.goebel-consult.de/blog/vorratsdatenspeicherung-jetzt-verfassungsbeschwerde-unterschreiben

Kolumne: http://www.cissp-gefluester.de/2011-11-in-troja-nichts-neues


[-- Attachment #2: Type: text/html, Size: 1795 bytes --]

Re: [PATCH 7/7] gnu: add python-geoip2 and python2-geoip2

[Hartmut Goebel]

Please ignore this PATCH 7/7, it is the old one.

Sorry, I'm not that used to the mail-based workflow.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 3/6] gnu: add python-selenium and python2-selenium

[Leo Famulari]

On Thu, Apr 21, 2016 at 09:19:50PM +0200, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python-selenium) (python2-selenium):
>   New variables.
> ---
>  gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 0241ed5..3c81a1f 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -8793,3 +8793,32 @@ provides support for parsing, splitting and formatting SQL statements.")
>  
>  (define-public python2-sqlparse
>    (package-with-python2 python-sqlparse))
> +
> +(define-public python-selenium
> +  (package
> +    (name "python-selenium")
> +    (version "2.53.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "selenium" version))
> +       (sha256
> +        (base32
> +         "1pj0ci4dxwfa0pkvjc60k7pw74zy6ay473mnzckbb58jlhc994jk"))))
> +    (build-system python-build-system)
> +    ;; FIXME webdriver/firefox contains pre-build binaries. Build them in
> +    ;; guix, but the source is not included.

Does Selenium work at all without these blobs?

Did you check what other free distros do about this? Here's a link to
the Debian packaging:
https://sources.debian.net/src/python-selenium/

Branching based on Python version (was [PATCH 2/6] gnu: add python-sqlparse and python2-sqlparse)

[Leo Famulari]

On Thu, Apr 21, 2016 at 09:19:49PM +0200, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python-sqlparse) (python2-sqlparse):
>   New variables.

> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (replace 'check
> +           (lambda* _
> +             ;; setup.py-integrated 2to3 only affects the build files, but
> +             ;; py.test is using the source files. So we need to convert them
> +             ;; manually.
> +             (if (zero? (system* "python3"))
> +                 (system* "2to3" "--no-diff" "-wn" "sqlparse" "tests")
> +                 #t)
> +             (zero? (system* "py.test")))))))

I think there must be a better way to do this conditional, but I'm not
sure what it is. Does anyone have any ideas?

Re: [PATCH 1/6] gnu: Add python-tblib and python2-tblib

[Leo Famulari]

On Thu, Apr 21, 2016 at 09:19:48PM +0200, Hartmut Goebel wrote:
> * packages/python.scm (python-tblib) (python2-tblib): New
>   variables.

Thanks for the updated patch!

> +(define-public python-tblib
> +  (package
> +    (name "python-tblib")
> +    (version "1.3.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "tblib" version))
> +       (sha256
> +        (base32
> +         "02iahfkfa927hb4jq2bak36ldihwapzacfiq5lyxg8llwn98a1yi"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +        (replace 'check
> +         ;; Run py.test, excluding some file which are no tests and fail to i
> +         ;; mport.  Excluding know problem-files is less intrusive to what
> +         ;; upstream has configured to be tested than restricting to only scan
> +         ;; directory tests/.
> +         (lambda _
> +           (zero? (system* "py.test" "--ignore=setup.py"
> +                           "--ignore=docs/conf.py"
> +                           "--ignore=ci/appveyor-download.py")))))))

I wonder if this really the best thing to do? With this method, the only
files that appear to be "tested" are the various .rst files, which are
just documentation.

Can you ask upstream how they prefer the tests to be run?

Re: [PATCH 3/6] gnu: add python-selenium and python2-selenium

[Ludovic Courtès]

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> +    ;; FIXME webdriver/firefox contains pre-build binaries. Build them in
> +    ;; guix, but the source is not included.

In addition to Leo’s reply, could you make sure the blobs are removed in
a ‘snippet’?  See ‘shogun’ in machine-learning.scm for an example of
that.

Thank you!

Ludo’.

Re: Branching based on Python version (was [PATCH 2/6] gnu: add python-sqlparse and python2-sqlparse)

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Thu, Apr 21, 2016 at 09:19:49PM +0200, Hartmut Goebel wrote:
>> * gnu/packages/python.scm (python-sqlparse) (python2-sqlparse):
>>   New variables.
>
>> +    (arguments
>> +     `(#:phases
>> +       (modify-phases %standard-phases
>> +         (replace 'check
>> +           (lambda* _
>> +             ;; setup.py-integrated 2to3 only affects the build files, but
>> +             ;; py.test is using the source files. So we need to convert them
>> +             ;; manually.
>> +             (if (zero? (system* "python3"))
>> +                 (system* "2to3" "--no-diff" "-wn" "sqlparse" "tests")
>> +                 #t)
>> +             (zero? (system* "py.test")))))))
>
> I think there must be a better way to do this conditional, but I'm not
> sure what it is. Does anyone have any ideas?

(guix build python-build-system) includes ‘get-python-version’, which
could be used for this purpose.

But I think the above is acceptable here (I’d use ‘when’ instead of the
one-armed ‘if’, but that’s purely cosmetic.)

Thanks,
Ludo’.

Re: Branching based on Python version (was [PATCH 2/6] gnu: add python-sqlparse and python2-sqlparse)

[Leo Famulari]

On Sun, Apr 24, 2016 at 11:40:29PM +0200, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > On Thu, Apr 21, 2016 at 09:19:49PM +0200, Hartmut Goebel wrote:
> >> * gnu/packages/python.scm (python-sqlparse) (python2-sqlparse):
> >>   New variables.
> >
> >> +    (arguments
> >> +     `(#:phases
> >> +       (modify-phases %standard-phases
> >> +         (replace 'check
> >> +           (lambda* _
> >> +             ;; setup.py-integrated 2to3 only affects the build files, but
> >> +             ;; py.test is using the source files. So we need to convert them
> >> +             ;; manually.
> >> +             (if (zero? (system* "python3"))
> >> +                 (system* "2to3" "--no-diff" "-wn" "sqlparse" "tests")
> >> +                 #t)
> >> +             (zero? (system* "py.test")))))))
> >
> > I think there must be a better way to do this conditional, but I'm not
> > sure what it is. Does anyone have any ideas?
> 
> (guix build python-build-system) includes ‘get-python-version’, which
> could be used for this purpose.
> 
> But I think the above is acceptable here (I’d use ‘when’ instead of the
> one-armed ‘if’, but that’s purely cosmetic.)

Okay, sounds good.

Hartmut, can you change it to use 'when' when you submit your revisions
to python-selenium and python-geoip2?

> 
> Thanks,
> Ludo’.

Re: Branching based on Python version (was [PATCH 2/6] gnu: add python-sqlparse and python2-sqlparse)

[Hartmut Goebel]

Am 24.04.2016 um 23:40 schrieb Ludovic Courtès:
> (guix build python-build-system) includes ‘get-python-version’, which
> could be used for this purpose.

I looked into this: using it is very cumbersome, since it requires
`python` to be passed:

   (get-python-version (assoc-ref inputs "python")))

Which then makes the "lambda" definition more complicated and the test
itself much more ugly :-( So I'll keep the `system` call.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |