[PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

Danny Milosavljevic (8):
  gnu: python-oslosphinx: Update to 4.9.0.
  gnu: Add python-reno.
  gnu: python-requests: Update to 2.10.0.
  gnu: Add python-dulwich.
  gnu: Add python-geventhttpclient.
  gnu: Add python-fastimport.
  gnu: python-oslosphinx: Add python-reno.
  gnu: python-dulwich: Fix tests.

 gnu/packages/openstack.scm | 32 ++++++++++++++--
 gnu/packages/python.scm    | 95 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 122 insertions(+), 5 deletions(-)

[PATCH 1/8] gnu: python-oslosphinx: Update to 4.9.0.

[Danny Milosavljevic]

* gnu/packages/openstack.scm (python-oslosphinx): Update to 4.9.0.
---
 gnu/packages/openstack.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index b3e3f08c2..da5b5f7c8 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -553,14 +553,14 @@ in transmittable and storable formats, such as JSON and MessagePack.")
 (define-public python-oslosphinx
   (package
     (name "python-oslosphinx")
-    (version "4.3.0")
+    (version "4.9.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslosphinx" version))
        (sha256
         (base32
-         "0cz8ym4i1n4rgljlqhyhfkpgdmid7nkb909k8r8nk186m9cmpla2"))))
+         "1rkpbajacr4misc676ybmj7lsbn0yga40w3ybk3kf5a6l2zyjafd"))))
     (build-system python-build-system)
     (propagated-inputs
       `(("python-requests" ,python-requests)))

[PATCH 2/8] gnu: Add python-reno.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index da5b5f7c8..338d35d13 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -550,6 +550,31 @@ in transmittable and storable formats, such as JSON and MessagePack.")
 (define-public python2-oslo.serialization
   (package-with-python2 python-oslo.serialization))
 
+(define-public python-reno
+  (package
+    (name "python-reno")
+    (version "2.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "reno" version))
+        (sha256
+          (base32 "1i2wnn5fnm3jm5774pahg000q0lma5i913hml91bbbm2mybphndd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-babel" ,python-babel)
+        ("python-dulwich" ,python-dulwich)
+        ("python-pbr" ,python-pbr)
+        ("python-pyyaml" ,python-pyyaml)
+        ("python-six" ,python-six)))
+    (home-page "http://docs.openstack.org/developer/reno/")
+    (synopsis "Release notes manager")
+    (description "This package provides a release notes manager for Python.")
+    (license asl2.0)))
+
+(define-public python2-reno
+  (package-with-python2 python-reno))
+
 (define-public python-oslosphinx
   (package
     (name "python-oslosphinx")

[PATCH 3/8] gnu: python-requests: Update to 2.10.0.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-requests): Update to 2.10.0.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6518006aa..9572f3a3c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2467,13 +2467,13 @@ installed with a newer @code{pip} or with wheel's own command line utility.")
 (define-public python-requests
   (package
     (name "python-requests")
-    (version "2.9.1")
+    (version "2.10.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "requests" version))
              (sha256
               (base32
-               "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"))))
+               "0m2vaasjdhrsf9nk05q0bybqw0w4w4p3p4vaw7730w8mi1bq3wb3"))))
     ;; TODO: unbundle urllib3 and chardet.
     (build-system python-build-system)
     (arguments

[PATCH 4/8] gnu: Add python-dulwich.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9572f3a3c..deb801631 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12655,3 +12655,28 @@ Features:
 @item Compiles templates into optimized, yet readable, Python code.
 @end enumerate")
     (license (license:x11-style "file://LICENSE"))))
+
+(define-public python-dulwich
+  (package
+    (name "python-dulwich")
+    (version "0.16.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "dulwich" version))
+        (sha256
+          (base32 "0fl47vzfgc3w3rmhn8naii905cjqcp0vc68iyvymxp7567hh6als"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-fastimport" ,python-fastimport)))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-geventhttpclient" ,python-geventhttpclient)))
+    (home-page "https://www.dulwich.io/")
+    (synopsis "Python git library")
+    (description "This package provides a Git library for Python.")
+    ;; dual-licensed
+    (license (list license:asl2.0 license:gpl2+))))
+
+(define-public python2-dulwich
+  (package-with-python2 python-dulwich))

[PATCH 5/8] gnu: Add python-geventhttpclient.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index deb801631..8c81eae64 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12656,6 +12656,29 @@ Features:
 @end enumerate")
     (license (license:x11-style "file://LICENSE"))))
 
+(define-public python-geventhttpclient
+  (package
+    (name "python-geventhttpclient")
+    (version "1.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "geventhttpclient" version))
+        (sha256
+          (base32 "07d0q3wzmml75227r6y6mrl5a0zpf4v9gj0ni5rhbyzmaj4az1xx"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-gevent" ,python-gevent)
+       ("python-six" ,python-six)
+       ("python-certifi" ,python-certifi)))
+    (home-page "http://github.com/gwik/geventhttpclient")
+    (synopsis "HTTP client library for gevent")
+    (description "This package provides an HTTP client library for gevent in Python.")
+    (license license:expat)))
+
+(define-public python2-geventhttpclient
+  (package-with-python2 python-geventhttpclient))
+
 (define-public python-dulwich
   (package
     (name "python-dulwich")

[PATCH 6/8] gnu: Add python-fastimport.

[Danny Milosavljevic]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8c81eae64..cd0a47043 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12679,6 +12679,25 @@ Features:
 (define-public python2-geventhttpclient
   (package-with-python2 python-geventhttpclient))
 
+(define-public python-fastimport
+  (package
+    (name "python-fastimport")
+    (version "0.9.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "fastimport" version))
+        (sha256
+          (base32 "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/jelmer/python-fastimport")
+    (synopsis "git fastimport/fastexport parser")
+    (description "This package provides a git fastimport/fastexport parser.")
+    (license license:gpl2+)))
+
+(define-public python2-fastimport
+  (package-with-python2 python-fastimport))
+
 (define-public python-dulwich
   (package
     (name "python-dulwich")

[PATCH 7/8] gnu: python-oslosphinx: Add python-reno.

[Danny Milosavljevic]

* gnu/packages/openstack.scm (python-oslosphinx)[native-inputs]:
  Add python-reno.
---
 gnu/packages/openstack.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 338d35d13..966146de8 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -593,7 +593,8 @@ in transmittable and storable formats, such as JSON and MessagePack.")
       `(("python-pbr" ,python-pbr)
         ("python-docutils" ,python-docutils)
         ("python-hacking" ,python-hacking)
-        ("python-sphinx" ,python-sphinx)))
+        ("python-sphinx" ,python-sphinx)
+        ("python-reno" ,python-reno)))
     (home-page "http://www.openstack.org/")
     (synopsis "OpenStack sphinx extensions and theme")
     (description

[PATCH 8/8] gnu: python-dulwich: Fix tests.

[Danny Milosavljevic]

* gnu/packages/python.scm (python-dulwich)[arguments]: New field.
---
 gnu/packages/python.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cd0a47043..232e033c7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12709,11 +12709,35 @@ Features:
         (sha256
           (base32 "0fl47vzfgc3w3rmhn8naii905cjqcp0vc68iyvymxp7567hh6als"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "dulwich/tests/compat/utils.py"
+               (("'git'") (string-append "'"
+                                         (assoc-ref inputs "git")
+                                         "/bin/git'")))
+             ;(substitute* "dulwich/hooks.py"
+             ;  (("f[.]write[(]args[[]0[]][)]") "f.write(args[0].encode('utf-8'))"))
+             (substitute* '("dulwich/tests/test_repository.py"
+                            "dulwich/tests/test_hooks.py")
+               (("#!/bin/sh") (string-append "#!" (which "sh"))))
+             (setenv "TEST_RUNNER" "unittest")
+             (setenv "PYTHONHASHSEED" "random")
+             (and
+               ;; Test without c extensions
+               ;; FIXME someone already called build_ext.
+               ;(zero? (system* "python" "-m" "unittest" "dulwich.tests.test_suite"))
+               ;; Test with c extensions
+               ;(zero? (system* "python" "setup.py" "build_ext" "-i"))
+               (zero? (system* "python" "-m" "unittest" "dulwich.tests.test_suite"))))))))
     (propagated-inputs
      `(("python-fastimport" ,python-fastimport)))
     (native-inputs
      `(("python-mock" ,python-mock)
-       ("python-geventhttpclient" ,python-geventhttpclient)))
+       ("python-geventhttpclient" ,python-geventhttpclient)
+       ("git" ,git)))
     (home-page "https://www.dulwich.io/")
     (synopsis "Python git library")
     (description "This package provides a Git library for Python.")

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Danny Milosavljevic (8):
>   gnu: python-oslosphinx: Update to 4.9.0.
>   gnu: Add python-reno.
>   gnu: python-requests: Update to 2.10.0.
>   gnu: Add python-dulwich.
>   gnu: Add python-geventhttpclient.
>   gnu: Add python-fastimport.
>   gnu: python-oslosphinx: Add python-reno.
>   gnu: python-dulwich: Fix tests.
>
>  gnu/packages/openstack.scm | 32 ++++++++++++++--
>  gnu/packages/python.scm    | 95 +++++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 122 insertions(+), 5 deletions(-)

Wow, thanks! Not-very-coincidentally was I working on the same (this is
to fix oslosphinx on python-tests branch).

I'll comment on the commits individually.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 2/8] gnu: Add python-reno.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/openstack.scm (python-reno, python2-reno): New variables.
> ---
>  gnu/packages/openstack.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
> index da5b5f7c8..338d35d13 100644
> --- a/gnu/packages/openstack.scm
> +++ b/gnu/packages/openstack.scm
> @@ -550,6 +550,31 @@ in transmittable and storable formats, such as JSON and MessagePack.")
>  (define-public python2-oslo.serialization
>    (package-with-python2 python-oslo.serialization))
>  
> +(define-public python-reno
> +  (package
> +    (name "python-reno")
> +    (version "2.0.3")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "reno" version))
> +        (sha256
> +          (base32 "1i2wnn5fnm3jm5774pahg000q0lma5i913hml91bbbm2mybphndd"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +      `(("python-babel" ,python-babel)
> +        ("python-dulwich" ,python-dulwich)
> +        ("python-pbr" ,python-pbr)
> +        ("python-pyyaml" ,python-pyyaml)
> +        ("python-six" ,python-six)))
> +    (home-page "http://docs.openstack.org/developer/reno/")
> +    (synopsis "Release notes manager")
> +    (description "This package provides a release notes manager for Python.")

I would (well, did) mention that this is for a particular usage of
"release notes":

    (description
     "Reno is a tool for storing release notes in a git repository and
building documentation from them.")

I think that is better, so users know up front if this is something they
are interested in.

> +    (license asl2.0)))
> +
> +(define-public python2-reno
> +  (package-with-python2 python-reno))
> +
>  (define-public python-oslosphinx
>    (package
>      (name "python-oslosphinx")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 3/8] gnu: python-requests: Update to 2.10.0.

[Marius Bakke]

[-- Attachment #1.1: Type: text/plain, Size: 250 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/python.scm (python-requests): Update to 2.10.0.

Since we're updating this package (and likely face some breakage), why
not go with the latest version (2.12.4)?

Patch attached!


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-requests-Update-to-2.12.4.patch --]
[-- Type: text/x-patch, Size: 1168 bytes --]

From b4198062f279db27b186930a54ffaacef2042761 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 17 Jan 2017 21:56:31 +0100
Subject: [PATCH] gnu: python-requests: Update to 2.12.4.

* gnu/packages/python.scm (python-requests, python2-requests): Update to 2.12.4.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6518006aa..7f72ed13d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2467,13 +2467,13 @@ installed with a newer @code{pip} or with wheel's own command line utility.")
 (define-public python-requests
   (package
     (name "python-requests")
-    (version "2.9.1")
+    (version "2.12.4")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "requests" version))
              (sha256
               (base32
-               "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"))))
+               "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"))))
     ;; TODO: unbundle urllib3 and chardet.
     (build-system python-build-system)
     (arguments
-- 
2.11.0

Re: [PATCH 4/8] gnu: Add python-dulwich.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/python.scm (python-dulwich, python2-dulwich): New variables.
> ---
>  gnu/packages/python.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 9572f3a3c..deb801631 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12655,3 +12655,28 @@ Features:
>  @item Compiles templates into optimized, yet readable, Python code.
>  @end enumerate")
>      (license (license:x11-style "file://LICENSE"))))
> +
> +(define-public python-dulwich
> +  (package
> +    (name "python-dulwich")
> +    (version "0.16.3")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "dulwich" version))
> +        (sha256
> +          (base32 "0fl47vzfgc3w3rmhn8naii905cjqcp0vc68iyvymxp7567hh6als"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-fastimport" ,python-fastimport)))
> +    (native-inputs
> +     `(("python-mock" ,python-mock)
> +       ("python-geventhttpclient" ,python-geventhttpclient)))

Hmm.. Some of these packages come after this package. Please rebase the
series so that fastimport and geventhttpclient come earlier. This helps
when bisecting, for example.

> +    (home-page "https://www.dulwich.io/")
> +    (synopsis "Python git library")
> +    (description "This package provides a Git library for Python.")

This should mention that it is a pure-python implementation. Here is
what I had:

    (synopsis "Git implementation in Python")
    (description
     "Dulwich is an implementation of the Git file formats and protocols
written in pure Python.")

> +    ;; dual-licensed

Is it both, or either? ;-)

I usually write "Can be used with either license.".

> +    (license (list license:asl2.0 license:gpl2+))))
> +
> +(define-public python2-dulwich
> +  (package-with-python2 python-dulwich))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

Hi,

On Tue, 17 Jan 2017 23:31:52 +0100
Marius Bakke <mbakke@fastmail.com> wrote:

> Danny Milosavljevic <dannym@scratchpost.org> writes:
> 
> > Danny Milosavljevic (8):
> >   gnu: python-oslosphinx: Update to 4.9.0.
> >   gnu: Add python-reno.
> >   gnu: python-requests: Update to 2.10.0.
> >   gnu: Add python-dulwich.
> >   gnu: Add python-geventhttpclient.
> >   gnu: Add python-fastimport.
> >   gnu: python-oslosphinx: Add python-reno.
> >   gnu: python-dulwich: Fix tests.
> >
> >  gnu/packages/openstack.scm | 32 ++++++++++++++--
> >  gnu/packages/python.scm    | 95 +++++++++++++++++++++++++++++++++++++++++++++-
> >  2 files changed, 122 insertions(+), 5 deletions(-)  
> 
> Wow, thanks! Not-very-coincidentally was I working on the same (this is
> to fix oslosphinx on python-tests branch).
> 
> I'll comment on the commits individually.

It's not done yet, it's just better than before - and I figured 8 commits at once is more than enough :)

Re: [PATCH 5/8] gnu: Add python-geventhttpclient.

[Marius Bakke]

[-- Attachment #1.1: Type: text/plain, Size: 1651 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/python.scm (python-geventhttpclient, python2-geventhttpclient):
>   New variables.
> ---
>  gnu/packages/python.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index deb801631..8c81eae64 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12656,6 +12656,29 @@ Features:
>  @end enumerate")
>      (license (license:x11-style "file://LICENSE"))))
>  
> +(define-public python-geventhttpclient
> +  (package
> +    (name "python-geventhttpclient")
> +    (version "1.3.1")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "geventhttpclient" version))
> +        (sha256
> +          (base32 "07d0q3wzmml75227r6y6mrl5a0zpf4v9gj0ni5rhbyzmaj4az1xx"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-gevent" ,python-gevent)
> +       ("python-six" ,python-six)
> +       ("python-certifi" ,python-certifi)))
> +    (home-page "http://github.com/gwik/geventhttpclient")
> +    (synopsis "HTTP client library for gevent")
> +    (description "This package provides an HTTP client library for gevent in Python.")
> +    (license license:expat)))
> +
> +(define-public python2-geventhttpclient
> +  (package-with-python2 python-geventhttpclient))

'python setup.py test' doesn't actually do anything on this package. In
addition, the tarball comes with .pyc files for the tests and breaks.

Here is a patch with .pyc files removed and tests enabled:


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-python-geventhttpclient.patch --]
[-- Type: text/x-patch, Size: 2607 bytes --]

From b991e2e4981bf8c05bf524f6eb87d47adebc2090 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 17 Jan 2017 23:13:19 +0100
Subject: [PATCH] gnu: Add python-geventhttpclient.

* gnu/packages/python.scm (python-geventhttpclient, python2-geventhttpclient):
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 a3a3c6c45..afbb3a367 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -10515,6 +10515,51 @@ to provide a high-level synchronous API on top of the libev event loop.")
 (define-public python2-gevent
   (package-with-python2 python-gevent))
 
+(define-public python-geventhttpclient
+  (package
+    (name "python-geventhttpclient")
+    (version "1.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "geventhttpclient" version))
+              (sha256
+               (base32
+                "07d0q3wzmml75227r6y6mrl5a0zpf4v9gj0ni5rhbyzmaj4az1xx"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Delete pre-compiled files.
+                  (for-each delete-file (find-files "src/geventhttpclient"
+                                                    ".*\\.pyc"))
+                  #t))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'delete-network-tests
+           (lambda _
+             (delete-file "src/geventhttpclient/tests/test_client.py")
+             #t))
+         (delete 'check)
+         (add-after 'install 'check
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (add-installed-pythonpath inputs outputs)
+             (zero? (system* "py.test" "src/geventhttpclient/tests" "-v")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (propagated-inputs
+     `(("python-certifi" ,python-certifi)
+       ("python-gevent" ,python-gevent)
+       ("python-six" ,python-six)))
+    (home-page "http://github.com/gwik/geventhttpclient")
+    (synopsis "HTTP client library for gevent")
+    (description "@code{python-geventhttpclient} is a high performance,
+concurrent HTTP client library for python using @code{gevent}.")
+    (license license:expat)))
+
+(define-public python2-geventhttpclient
+  (package-with-python2 python-geventhttpclient))
+
 (define-public python-twisted
   (package
     (name "python-twisted")
-- 
2.11.0

Re: [PATCH 6/8] gnu: Add python-fastimport.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/python.scm (python-fastimport, python2-fastimport):
>   New variables.
> ---
>  gnu/packages/python.scm | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 8c81eae64..cd0a47043 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12679,6 +12679,25 @@ Features:
>  (define-public python2-geventhttpclient
>    (package-with-python2 python-geventhttpclient))
>  
> +(define-public python-fastimport
> +  (package
> +    (name "python-fastimport")
> +    (version "0.9.6")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "fastimport" version))
> +        (sha256
> +          (base32 "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"))))
> +    (build-system python-build-system)
> +    (home-page "https://github.com/jelmer/python-fastimport")
> +    (synopsis "git fastimport/fastexport parser")
> +    (description "This package provides a git fastimport/fastexport parser.")

Does `guix lint` accept the lowercase synopsis?

Here is what I have:

    (synopsis "VCS fastimport parser and generator in Python")
    (description
     "This package provides a parser for and generator of the Git
@url{https://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html,fastimport}
format.")

> +    (license license:gpl2+)))
> +
> +(define-public python2-fastimport
> +  (package-with-python2 python-fastimport))
> +
>  (define-public python-dulwich
>    (package
>      (name "python-dulwich")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 7/8] gnu: python-oslosphinx: Add python-reno.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/openstack.scm (python-oslosphinx)[native-inputs]:
>   Add python-reno.

The commit title is weird (not the above quote).

I think this commit can be squashed into the oslosphinx update, since
it's a recent dependency.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 8/8] gnu: python-dulwich: Fix tests.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/python.scm (python-dulwich)[arguments]: New field.
> ---
>  gnu/packages/python.scm | 26 +++++++++++++++++++++++++-
>  1 file changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index cd0a47043..232e033c7 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12709,11 +12709,35 @@ Features:
>          (sha256
>            (base32 "0fl47vzfgc3w3rmhn8naii905cjqcp0vc68iyvymxp7567hh6als"))))
>      (build-system python-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (replace 'check
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "dulwich/tests/compat/utils.py"
> +               (("'git'") (string-append "'"
> +                                         (assoc-ref inputs "git")
> +                                         "/bin/git'")))
> +             ;(substitute* "dulwich/hooks.py"
> +             ;  (("f[.]write[(]args[[]0[]][)]") "f.write(args[0].encode('utf-8'))"))
> +             (substitute* '("dulwich/tests/test_repository.py"
> +                            "dulwich/tests/test_hooks.py")
> +               (("#!/bin/sh") (string-append "#!" (which "sh"))))
> +             (setenv "TEST_RUNNER" "unittest")
> +             (setenv "PYTHONHASHSEED" "random")
> +             (and
> +               ;; Test without c extensions
> +               ;; FIXME someone already called build_ext.
> +               ;(zero? (system* "python" "-m" "unittest" "dulwich.tests.test_suite"))
> +               ;; Test with c extensions
> +               ;(zero? (system* "python" "setup.py" "build_ext" "-i"))

I think build_ext is called as part of the regular build process. Why
does it need to be called again (with the -i flag)?

Maybe tests can be run after install instead, with the
add-installed-pythonpath trick?

Otherwise LGTM, assuming this will be squashed into the dulwich commit.

> +               (zero? (system* "python" "-m" "unittest" "dulwich.tests.test_suite"))))))))
>      (propagated-inputs
>       `(("python-fastimport" ,python-fastimport)))
>      (native-inputs
>       `(("python-mock" ,python-mock)
> -       ("python-geventhttpclient" ,python-geventhttpclient)))
> +       ("python-geventhttpclient" ,python-geventhttpclient)
> +       ("git" ,git)))
>      (home-page "https://www.dulwich.io/")
>      (synopsis "Python git library")
>      (description "This package provides a Git library for Python.")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

Btw are you maybe working on unittest2 0.8.0 already?

Re: [PATCH 8/8] gnu: python-dulwich: Fix tests.

[Danny Milosavljevic]

Hi,

On Tue, 17 Jan 2017 23:55:50 +0100
Marius Bakke <mbakke@fastmail.com> wrote:
> > +             (setenv "TEST_RUNNER" "unittest")
> > +             (setenv "PYTHONHASHSEED" "random")
> > +             (and
> > +               ;; Test without c extensions
> > +               ;; FIXME someone already called build_ext.
> > +               ;(zero? (system* "python" "-m" "unittest" "dulwich.tests.test_suite"))
> > +               ;; Test with c extensions
> > +               ;(zero? (system* "python" "setup.py" "build_ext" "-i"))  
> 
> I think build_ext is called as part of the regular build process. Why
> does it need to be called again (with the -i flag)?

It's copied from the .travis file. Since we install the C extension so we should also test the C extension - and the other test doesn't matter. But I'm unsure whether to leave the comment in.

Re: [PATCH 3/8] gnu: python-requests: Update to 2.10.0.

[Danny Milosavljevic]

On Tue, 17 Jan 2017 23:38:43 +0100
Marius Bakke <mbakke@fastmail.com> wrote:

> Danny Milosavljevic <dannym@scratchpost.org> writes:
> 
> > * gnu/packages/python.scm (python-requests): Update to 2.10.0.  
> 
> Since we're updating this package (and likely face some breakage), why
> not go with the latest version (2.12.4)?
> 
> Patch attached!

LGTM!

I think this one is independent from the others, trivial and I'll make a new series anyway. Can you push that one?

Re: [PATCH 5/8] gnu: Add python-geventhttpclient.

[Danny Milosavljevic]

LGTM!

Let's just use yours here. It's also pretty independent...

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Btw are you maybe working on unittest2 0.8.0 already?

I was not finished with dulwich yet, so no. What is it needed for?

I was planning to do scipy next, but I'll gladly do something easier :-D

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 5/8] gnu: Add python-geventhttpclient.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> LGTM!
>
> Let's just use yours here. It's also pretty independent...

OK! Pushed this and the requests update. Looks like we have a ways to go
still :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

On Wed, 18 Jan 2017 00:17:06 +0100
Marius Bakke <mbakke@fastmail.com> wrote:

> Danny Milosavljevic <dannym@scratchpost.org> writes:
> 
> > Btw are you maybe working on unittest2 0.8.0 already?  
> 
> I was not finished with dulwich yet, so no. What is it needed for?

python-unittest2 -> python-testtools -> python-reno

Right now 2 of python-unittest2's unittests fail when using:

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4ad8f3a04..8001365c4 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1646,17 +1646,26 @@ interfaces and processes.")
 (define-public python-unittest2
   (package
     (name "python-unittest2")
-    (version "0.5.1")
+    (version "0.8.0")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-"
-             version ".tar.gz"))
+       (uri (pypi-uri "unittest2" version))
        (sha256
         (base32
-         "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q"))))
+         "0akyi9rs4dbnj1vzdcs50cab6x6zksiw7rn39jwacgygc71bj05v"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-argparse
+           (lambda _
+             (substitute* "setup.py"
+               (("argparse") "configargparse"))
+             #t)))))
+    (propagated-inputs
+     `(("python-six" ,python-six)
+       ("python-configargparse" ,python-configargparse)))
     (home-page "http://pypi.python.org/pypi/unittest2")
     (synopsis "Python unit testing library")
     (description

The failures are:

======================================================================
FAIL: test_loadTestsFromName__relative_malformed_name (unittest2.test.test_loader.Test_TestLoader)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 425, in check_module_lookup_error
    "'module' object has no attribute '%s'" % attr, attr, regex)
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 417, in _check_module_lookup_error
    'missing error string in %r' % error)
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/case.py", line 1094, in assertIn
    self.fail(self._formatMessage(msg, standardMsg))
AssertionError: "'module' object has no attribute 'abc () //'" not found in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n' : missing error string in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 518, in test_loadTestsFromName__relative_malformed_name
    error, test, 'unittest2', 'abc () //', 'abc \(\) //')
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 429, in check_module_lookup_error
    "module '%s' has no attribute '%s'" % (name, regex), attr, regex)
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 417, in _check_module_lookup_error
    'missing error string in %r' % error)
AssertionError: "module 'unittest2' has no attribute 'abc \\(\\) //'" not found in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n' : missing error string in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n'

======================================================================
FAIL: test_loadTestsFromNames__relative_malformed_name (unittest2.test.test_loader.Test_TestLoader)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 425, in check_module_lookup_error
    "'module' object has no attribute '%s'" % attr, attr, regex)
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 417, in _check_module_lookup_error
    'missing error string in %r' % error)
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/case.py", line 1094, in assertIn
    self.fail(self._formatMessage(msg, standardMsg))
AssertionError: "'module' object has no attribute 'abc () //'" not found in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n' : missing error string in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 928, in test_loadTestsFromNames__relative_malformed_name
    error, test, 'unittest2', 'abc () //', 'abc \(\) //')
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 429, in check_module_lookup_error
    "module '%s' has no attribute '%s'" % (name, regex), attr, regex)
  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/test/test_loader.py", line 417, in _check_module_lookup_error
    'missing error string in %r' % error)
AssertionError: "module 'unittest2' has no attribute 'abc \\(\\) //'" not found in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n' : missing error string in 'Failed to access attribute:\nTraceback (most recent call last):\n  File "/tmp/guix-build-python-unittest2-0.8.0.drv-0/unittest2-0.8.0/unittest2/loader.py", line 176, in loadTestsFromName\n    parent, obj = obj, getattr(obj, part)\nAttributeError: module \'unittest2\' has no attribute \'abc () //\'\n'

----------------------------------------------------------------------

It's using an invalid attribute name (containing parens) and then tries to regex- and plain-match and apparently messes up there...

I'm trying to track it down.

> I was planning to do scipy next, but I'll gladly do something easier :-D

:)

Re: [PATCH 8/8] gnu: python-dulwich: Fix tests.

[Hartmut Goebel]

Am 17.01.2017 um 23:25 schrieb Danny Milosavljevic:
> +             ;(substitute* "dulwich/hooks.py"
> +             ;  (("f[.]write[(]args[[]0[]][)]") "f.write(args[0].encode('utf-8'))"))

This is an interesting but quite unusual way to escape the special
characters. I suggest using the more common type with back-slash, esp.
since "[[]" and "[]]" are very hard to get.

-- 
Regards
Hartmut Goebel

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

Re: [PATCH 2/8] gnu: Add python-reno.

[Hartmut Goebel]

Am 17.01.2017 um 23:25 schrieb Danny Milosavljevic:
> +        ("python-pbr" ,python-pbr)

AFAIK this is a "library that injects some useful and sensible default
behaviors into your setuptools run." So I assume this should be a native
import. If it is indeed needed as run-time, I suggest adding a short
comment for what, otherwise others may stumble on this, too.

-- 
Regards
Hartmut Goebel

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

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

Nevermind, fixed by updating to unittest2 1.1.0 (which has more dependencies, though).

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Marius Bakke]

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

Danny Milosavljevic <dannym@scratchpost.org> writes:

> On Wed, 18 Jan 2017 00:17:06 +0100
> Marius Bakke <mbakke@fastmail.com> wrote:
>
>> Danny Milosavljevic <dannym@scratchpost.org> writes:
>> 
>> > Btw are you maybe working on unittest2 0.8.0 already?  
>> 
>> I was not finished with dulwich yet, so no. What is it needed for?
>
> python-unittest2 -> python-testtools -> python-reno

Ah, right. I have a feeling we are creating more failures than we are
fixing! But it's definitely needed.

Thanks a lot for taking this on. I'll dive into scipy next.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

On Wed, 18 Jan 2017 00:46:56 +0100
Danny Milosavljevic <dannym@scratchpost.org> wrote:

> Nevermind, fixed by updating to unittest2 1.1.0 (which has more dependencies, though).

Nope. Turns out that has the exact same problem. But I found the cause now and fixed it.

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[ng0]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Danny Milosavljevic (8):
>   gnu: python-oslosphinx: Update to 4.9.0.
>   gnu: Add python-reno.
>   gnu: python-requests: Update to 2.10.0.
>   gnu: Add python-dulwich.
>   gnu: Add python-geventhttpclient.
>   gnu: Add python-fastimport.
>   gnu: python-oslosphinx: Add python-reno.
>   gnu: python-dulwich: Fix tests.

This is unfortunate. I am just rebasing the branch from september
which somehow got stuck. I have dulwich, fastimport,
geventhttpclient, requests update, and many other python modules
in there.
I try to get the rebase done tomorrow and send them again.

>  gnu/packages/openstack.scm | 32 ++++++++++++++--
>  gnu/packages/python.scm    | 95 +++++++++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 122 insertions(+), 5 deletions(-)
>
>
>

-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH 0/8] Make python-oslosphinx work in python-tests branch.

[Danny Milosavljevic]

Hi ng0,

> >   gnu: Add python-dulwich.

Do the git commandline tests execute for your dulwich?

For me they are skipped unless I hard-patch the paths to the git executable in the tests (in dulwich/tests/compat/utils.py ).