[bug#39777] [PATCH 0/5] gnu: poetry: Update to 1.0.3.

[bug#39777] [PATCH 0/5] gnu: poetry: Update to 1.0.3.

[Tanguy Le Carrour]

Hi Guix!

Following my update on the work on poetry [1][], here is a patch series
to update poetry and the required dependencies.

[1][]: https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00293.html

To make it work, I had to disable some tests. Some of those failing
tests were reported upstream, some I'll try to fix later or report upstream.

Regards

Tanguy Le Carrour (5):
  gnu: python-pexpect: Update to 4.8.0.
  gnu: python-jsonschema: Update to 3.2.0.
  gnu: python-fakeredis: Update to 1.2.1.
  gnu: python-cachy: Update to 0.3.0.
  gnu: poetry: Update to 1.0.3.

 gnu/packages/databases.scm  |  7 +++--
 gnu/packages/python-xyz.scm | 59 ++++++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 19 deletions(-)

-- 
2.25.1

[bug#39777] [PATCH 1/5] gnu: python-pexpect: Update to 4.8.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-pexpect): Update to 4.8.0.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7a335c04b6..4ccc7436b5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4926,13 +4926,13 @@ displayed.")
 (define-public python-pexpect
   (package
     (name "python-pexpect")
-    (version "4.6.0")
+    (version "4.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pexpect" version))
        (sha256
-        (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia"))))
+        (base32 "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -4946,7 +4946,10 @@ displayed.")
                ;; Many tests try to use the /bin directory which
                ;; is not present in the build environment.
                ;; Use one that's non-empty and unlikely to change.
-               (("/bin'") "/dev'"))
+               (("/bin'") "/dev'")
+               ;; Disable failing test.  See upstream bug report
+               ;; https://github.com/pexpect/pexpect/issues/568
+               (("def test_bash") "def _test_bash"))
              ;; XXX: Socket connection test gets "Connection reset by peer".
              ;; Why does it not work? Delete for now.
              (delete-file "tests/test_socket.py")
-- 
2.25.1

[bug#39777] [PATCH 2/5] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
[propagated-inputs]: Add python-importlib-metadata.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4ccc7436b5..0474478f5d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2016,17 +2016,22 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-    (version "3.0.1")
+    (version "3.2.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "jsonschema" version))
              (sha256
               (base32
-               "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc"))))
+               "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-test
+           (lambda _
+             (substitute* "jsonschema/tests/test_cli.py"
+               (("def test_version") "def _test_version"))
+             #t))
          (replace 'check
            (lambda _
              (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
@@ -2036,6 +2041,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
        ("python-twisted" ,python-twisted)))
     (propagated-inputs
      `(("python-attrs" ,python-attrs)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-pyrsistent" ,python-pyrsistent)
        ("python-six" ,python-six)))
     (home-page "https://github.com/Julian/jsonschema")
-- 
2.25.1

[bug#39777] [PATCH 3/5] gnu: python-fakeredis: Update to 1.2.1.

[Tanguy Le Carrour]

* gnu/packages/databases.scm (python-fakeredis): Update to 1.2.1.
[propagated-inputs]: Add python-sortedcontainers.
---
 gnu/packages/databases.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c21ca5a490..60a5945e52 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2876,18 +2877,20 @@ parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 (define-public python-fakeredis
   (package
     (name "python-fakeredis")
-    (version "0.8.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "fakeredis" version))
        (sha256
         (base32
-         "0zncahj3byyasyfx9i7k991ph0n0lq8v3a21pqri5qxn9564bk9r"))))
+         "1s12mn4q4hz7402139khn9fx56kibj7nn0d6w81hn0zs07b90wpc"))))
     (build-system python-build-system)
     (arguments
      ;; no tests
      `(#:tests? #f))
+    (propagated-inputs
+      `(("python-sortedcontainers" ,python-sortedcontainers)))
     (home-page "https://github.com/jamesls/fakeredis")
     (synopsis "Fake implementation of redis API for testing purposes")
     (description
-- 
2.25.1

[bug#39777] [PATCH 4/5] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
[arguments]: Disable failing tests.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0474478f5d..0f3591766c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10643,15 +10643,29 @@ strings require only one extra byte in addition to the strings themselves.")
 (define-public python-cachy
   (package
     (name "python-cachy")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cachy" version))
        (sha256
         (base32
-         "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"))))
+         "1cb9naly8ampzlky7h74n5wj628l7jkpsh0c0jz0namlrvs82r8q"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/stores/test_memcached_store.py"
+               (("def test_forever") "def _test_forever")
+               (("def test_increment") "def _test_increment")
+               (("def test_decrement") "def _test_decrement")
+               (("def test_put_numeric_value") "def _test_put_numeric_value")
+               (("def test_put_value_into_memcache") "def _test_put_value_into_memcache")
+               (("def test_value_is_returned") "def _test_value_is_returned")
+               (("def test_value_is_returned_for_numerics") "def _test_value_is_returned_for_numerics"))
+             #t)))))
     (native-inputs
      `(("python-fakeredis" ,python-fakeredis)
        ("python-flexmock" ,python-flexmock)
-- 
2.25.1

[bug#39777] [PATCH 5/5] gnu: poetry: Update to 1.0.3.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (poetry): Update to 1.0.3.
[propagated-inputs] Add python-clikit, add python-importlib-metadata,
add python-keyring, add python-pexpect, remove python-msgpack,
remove python-glob2.  [home-page] Update URL.
[arguments] Remove distutils patch, patch versions of keyring
and importlib-metadata.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0f3591766c..445a8dd0f5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10685,34 +10685,36 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
 (define-public poetry
   (package
     (name "poetry")
-    (version "0.12.17")
-    ;; Poetry can only be built from source with poetry.
+    (version "1.0.3")
+    ;; Poetry can only be built from source with Poetry.
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "poetry" version))
        (sha256
         (base32
-         "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"))))
+         "0fx1ilgkrsqjjnpgv5zljsp0wpcsywdqvvi8im9z396qq6qpk830"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ;; Pypi does not have tests.
        #:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'patch-setup-py
            (lambda _
-             ;; Bug in poetry https://github.com/sdispater/poetry/issues/866.
-             (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/"
-                     "setup.py")
+             (substitute* "setup.py"
+               (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6
+               (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0"))
              #t)))))
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol)
        ("python-cachy" ,python-cachy)
        ("python-cleo" ,python-cleo)
-       ("python-glob2" ,python-glob2)
+       ("python-clikit" ,python-clikit)
        ("python-html5lib" ,python-html5lib)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-jsonschema" ,python-jsonschema)
-       ("python-msgpack" ,python-msgpack)
+       ("python-keyring" ,python-keyring)
+       ("python-pexpect" ,python-pexpect)
        ("python-pkginfo" ,python-pkginfo)
        ("python-pyparsing" ,python-pyparsing)
        ("python-pyrsistent" ,python-pyrsistent)
@@ -10721,7 +10723,7 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
        ("python-shellingham" ,python-shellingham)
        ("python-tomlkit" ,python-tomlkit)
        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://poetry.eustace.io/")
+    (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
 in Python.  It allows you to declare the libraries your project depends on and
-- 
2.25.1

[bug#39777] [PATCH V2 01/10] gnu: python-pexpect: Update to 4.8.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-pexpect): Update to 4.8.0.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bd107f9648..04930aff9d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4965,13 +4965,13 @@ displayed.")
 (define-public python-pexpect
   (package
     (name "python-pexpect")
-    (version "4.6.0")
+    (version "4.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pexpect" version))
        (sha256
-        (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia"))))
+        (base32 "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -4985,7 +4985,10 @@ displayed.")
                ;; Many tests try to use the /bin directory which
                ;; is not present in the build environment.
                ;; Use one that's non-empty and unlikely to change.
-               (("/bin'") "/dev'"))
+               (("/bin'") "/dev'")
+               ;; Disable failing test.  See upstream bug report
+               ;; https://github.com/pexpect/pexpect/issues/568
+               (("def test_bash") "def _test_bash"))
              ;; XXX: Socket connection test gets "Connection reset by peer".
              ;; Why does it not work? Delete for now.
              (delete-file "tests/test_socket.py")
-- 
2.25.1

[bug#39777] [PATCH V2 02/10] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
[arguments]: Disable failing tests.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 04930aff9d..892632f6c4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10760,15 +10760,29 @@ strings require only one extra byte in addition to the strings themselves.")
 (define-public python-cachy
   (package
     (name "python-cachy")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cachy" version))
        (sha256
         (base32
-         "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"))))
+         "1cb9naly8ampzlky7h74n5wj628l7jkpsh0c0jz0namlrvs82r8q"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/stores/test_memcached_store.py"
+               (("def test_forever") "def _test_forever")
+               (("def test_increment") "def _test_increment")
+               (("def test_decrement") "def _test_decrement")
+               (("def test_put_numeric_value") "def _test_put_numeric_value")
+               (("def test_put_value_into_memcache") "def _test_put_value_into_memcache")
+               (("def test_value_is_returned") "def _test_value_is_returned")
+               (("def test_value_is_returned_for_numerics") "def _test_value_is_returned_for_numerics"))
+             #t)))))
     (native-inputs
      `(("python-fakeredis" ,python-fakeredis)
        ("python-flexmock" ,python-flexmock)
-- 
2.25.1

[bug#39777] [PATCH V2 03/10] gnu: python-fakeredis: Update to 1.2.1.

[Tanguy Le Carrour]

* gnu/packages/databases.scm (python-fakeredis): Update to 1.2.1.
[propagated-inputs]: Add python-sortedcontainers.
---
 gnu/packages/databases.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c8d12f43b5..9d08092d5d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2876,18 +2877,20 @@ parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 (define-public python-fakeredis
   (package
     (name "python-fakeredis")
-    (version "0.8.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "fakeredis" version))
        (sha256
         (base32
-         "0zncahj3byyasyfx9i7k991ph0n0lq8v3a21pqri5qxn9564bk9r"))))
+         "1s12mn4q4hz7402139khn9fx56kibj7nn0d6w81hn0zs07b90wpc"))))
     (build-system python-build-system)
     (arguments
      ;; no tests
      `(#:tests? #f))
+    (propagated-inputs
+      `(("python-sortedcontainers" ,python-sortedcontainers)))
     (home-page "https://github.com/jamesls/fakeredis")
     (synopsis "Fake implementation of redis API for testing purposes")
     (description
-- 
2.25.1

[bug#39777] [PATCH V2 04/10] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
[propagated-inputs]: Add python-importlib-metadata.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 892632f6c4..eb85d90cc0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2017,17 +2017,22 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-    (version "3.0.1")
+    (version "3.2.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "jsonschema" version))
              (sha256
               (base32
-               "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc"))))
+               "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-test
+           (lambda _
+             (substitute* "jsonschema/tests/test_cli.py"
+               (("def test_version") "def _test_version"))
+             #t))
          (replace 'check
            (lambda _
              (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
@@ -2037,6 +2042,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
        ("python-twisted" ,python-twisted)))
     (propagated-inputs
      `(("python-attrs" ,python-attrs)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-pyrsistent" ,python-pyrsistent)
        ("python-six" ,python-six)))
     (home-page "https://github.com/Julian/jsonschema")
-- 
2.25.1

[bug#39777] [PATCH V2 05/10] gnu: python-pastel: Update to 0.2.0.

[Tanguy Le Carrour]

From: Tanguy Le Carrour <>

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

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c30f23d921..d474a06897 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -833,14 +833,14 @@ rendering SVG graphics.")
 (define-public python-pastel
   (package
     (name "python-pastel")
-    (version "0.1.1")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pastel" version))
        (sha256
         (base32
-         "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz"))))
+         "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.25.1

[bug#39777] [PATCH V2 06/10] gnu: python-msgpack: Update to 1.0.0.

[Tanguy Le Carrour]

From: Tanguy Le Carrour <>

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eb85d90cc0..0ac727f9a2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7049,13 +7049,13 @@ should be stored on various operating systems.")
 (define-public python-msgpack
   (package
     (name "python-msgpack")
-    (version "0.5.6")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "msgpack" version))
               (sha256
                (base32
-                "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f"))))
+                "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m"))))
     (build-system python-build-system)
     (arguments
      `(#:modules ((guix build utils)
-- 
2.25.1

[bug#39777] [PATCH V2 07/10] gnu: python-cachecontrol: Add missing propagated-input.

[Tanguy Le Carrour]

From: Tanguy Le Carrour <>

* gnu/packages/python-web.scm (python-cachecontrol):
[propagated-inputs]: Add python-msgpack.
---
 gnu/packages/python-web.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d294e43d45..214a98522f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2037,6 +2037,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients."
      `(#:tests? #f))
     (propagated-inputs
      `(("python-requests" ,python-requests)
+       ("python-msgpack" ,python-msgpack)
        ("python-lockfile" ,python-lockfile)))
     (home-page "https://github.com/ionrock/cachecontrol")
     (synopsis "The httplib2 caching algorithms for use with requests")
-- 
2.25.1

[bug#39777] [PATCH V2 08/10] gnu: python-tomlkit: Update to 0.5.11.

[Tanguy Le Carrour]

From: Tanguy Le Carrour <>

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0ac727f9a2..c266889292 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10656,14 +10656,14 @@ docstring and colored output.")
 (define-public python-tomlkit
   (package
     (name "python-tomlkit")
-    (version "0.5.8")
+    (version "0.5.11")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tomlkit" version))
        (sha256
         (base32
-         "0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j"))))
+         "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-pytest" ,python-pytest)))
-- 
2.25.1

[bug#39777] [PATCH V2 09/10] gnu: python-clikit: Update to 0.4.2.

[Tanguy Le Carrour]

From: Tanguy Le Carrour <>

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c266889292..ed0ca07917 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10723,14 +10723,14 @@ more, possibly remote, memcached servers.")
 (define-public python-clikit
   (package
     (name "python-clikit")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "clikit" version))
        (sha256
         (base32
-         "10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a"))))
+         "1jnnr21hvzx4i29nbph1z96ympv0njiwyvngjq48w1q05133cwzn"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pastel" ,python-pastel)
-- 
2.25.1

[bug#39777] [PATCH V2 10/10] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (poetry): Update to 1.0.5.
[propagated-inputs] Add python-clikit, add python-importlib-metadata,
add python-keyring, add python-pexpect, remove python-msgpack,
remove python-glob2.  [home-page] Update URL.
[arguments] Remove distutils patch, patch versions of keyring
and importlib-metadata.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ed0ca07917..9cf829eea4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10808,34 +10808,36 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
 (define-public poetry
   (package
     (name "poetry")
-    (version "0.12.17")
-    ;; Poetry can only be built from source with poetry.
+    (version "1.0.5")
+    ;; Poetry can only be built from source with Poetry.
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "poetry" version))
        (sha256
         (base32
-         "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"))))
+         "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ;; Pypi does not have tests.
        #:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'patch-setup-py
            (lambda _
-             ;; Bug in poetry https://github.com/sdispater/poetry/issues/866.
-             (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/"
-                     "setup.py")
+             (substitute* "setup.py"
+               (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6
+               (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0"))
              #t)))))
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol)
        ("python-cachy" ,python-cachy)
        ("python-cleo" ,python-cleo)
-       ("python-glob2" ,python-glob2)
+       ("python-clikit" ,python-clikit)
        ("python-html5lib" ,python-html5lib)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-jsonschema" ,python-jsonschema)
-       ("python-msgpack" ,python-msgpack)
+       ("python-keyring" ,python-keyring)
+       ("python-pexpect" ,python-pexpect)
        ("python-pkginfo" ,python-pkginfo)
        ("python-pyparsing" ,python-pyparsing)
        ("python-pyrsistent" ,python-pyrsistent)
@@ -10844,7 +10846,7 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
        ("python-shellingham" ,python-shellingham)
        ("python-tomlkit" ,python-tomlkit)
        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://poetry.eustace.io/")
+    (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
 in Python.  It allows you to declare the libraries your project depends on and
-- 
2.25.1

[bug#39777] [PATCH V2 0/10] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

Hi Guix!

In the meantime, Poetry 1.0.5 has been released. This V2 patch set updates
some more dependencies and updates poetry to 1.0.5.

Regards

-- 
Tanguy

[bug#39777] [PATCH V3 0/11] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

Hi,

V2 works fine on my computer at home, but when I applied it at work and
build poetry… it failed?! I had to add missing propageted inputs to
(yet) another package!?
Here is the updated patch set…

-- 
Tanguy

[bug#39777] [PATCH V3 01/11] gnu: python-pexpect: Update to 4.8.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-pexpect): Update to 4.8.0.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 25dfe90907..5aa42e4871 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5021,13 +5021,13 @@ displayed.")
 (define-public python-pexpect
   (package
     (name "python-pexpect")
-    (version "4.6.0")
+    (version "4.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pexpect" version))
        (sha256
-        (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia"))))
+        (base32 "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -5041,7 +5041,10 @@ displayed.")
                ;; Many tests try to use the /bin directory which
                ;; is not present in the build environment.
                ;; Use one that's non-empty and unlikely to change.
-               (("/bin'") "/dev'"))
+               (("/bin'") "/dev'")
+               ;; Disable failing test.  See upstream bug report
+               ;; https://github.com/pexpect/pexpect/issues/568
+               (("def test_bash") "def _test_bash"))
              ;; XXX: Socket connection test gets "Connection reset by peer".
              ;; Why does it not work? Delete for now.
              (delete-file "tests/test_socket.py")
-- 
2.25.1

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
[arguments]: Disable failing tests.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5aa42e4871..82892802ff 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10816,15 +10816,29 @@ strings require only one extra byte in addition to the strings themselves.")
 (define-public python-cachy
   (package
     (name "python-cachy")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cachy" version))
        (sha256
         (base32
-         "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"))))
+         "1cb9naly8ampzlky7h74n5wj628l7jkpsh0c0jz0namlrvs82r8q"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-tests
+           (lambda _
+             (substitute* "tests/stores/test_memcached_store.py"
+               (("def test_forever") "def _test_forever")
+               (("def test_increment") "def _test_increment")
+               (("def test_decrement") "def _test_decrement")
+               (("def test_put_numeric_value") "def _test_put_numeric_value")
+               (("def test_put_value_into_memcache") "def _test_put_value_into_memcache")
+               (("def test_value_is_returned") "def _test_value_is_returned")
+               (("def test_value_is_returned_for_numerics") "def _test_value_is_returned_for_numerics"))
+             #t)))))
     (native-inputs
      `(("python-fakeredis" ,python-fakeredis)
        ("python-flexmock" ,python-flexmock)
-- 
2.25.1

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Leo Famulari]

On Mon, Mar 09, 2020 at 09:18:18AM +0100, Tanguy Le Carrour wrote:
> * gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
> [arguments]: Disable failing tests.

> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'check 'disable-failing-tests
> +           (lambda _
> +             (substitute* "tests/stores/test_memcached_store.py"
> +               (("def test_forever") "def _test_forever")
> +               (("def test_increment") "def _test_increment")
> +               (("def test_decrement") "def _test_decrement")
> +               (("def test_put_numeric_value") "def _test_put_numeric_value")
> +               (("def test_put_value_into_memcache") "def _test_put_value_into_memcache")
> +               (("def test_value_is_returned") "def _test_value_is_returned")
> +               (("def test_value_is_returned_for_numerics") "def _test_value_is_returned_for_numerics"))
> +             #t)))))

Do you have any idea what's going on with these tests?

We should at least add a comment here, explaining why skipping the tests
is not hiding something that will be a problem while using cachy.

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

Le 03/11, Leo Famulari a écrit :
> On Mon, Mar 09, 2020 at 09:18:18AM +0100, Tanguy Le Carrour wrote:
> > * gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
> > [arguments]: Disable failing tests.
> 
> > +    (arguments
> > +     '(#:phases
> > +       (modify-phases %standard-phases
> > +         (add-before 'check 'disable-failing-tests
> > +           (lambda _
> > +             (substitute* "tests/stores/test_memcached_store.py"
> > +               (("def test_forever") "def _test_forever")
> > +               (("def test_increment") "def _test_increment")
> > +               (("def test_decrement") "def _test_decrement")
> > +               (("def test_put_numeric_value") "def _test_put_numeric_value")
> > +               (("def test_put_value_into_memcache") "def _test_put_value_into_memcache")
> > +               (("def test_value_is_returned") "def _test_value_is_returned")
> > +               (("def test_value_is_returned_for_numerics") "def _test_value_is_returned_for_numerics"))
> > +             #t)))))
> 
> Do you have any idea what's going on with these tests?
> 
> We should at least add a comment here, explaining why skipping the tests
> is not hiding something that will be a problem while using cachy.

Those ones are out of my comfort zone! :-(

Seems that all the `RedisStoreTestCase` are failing with messages like:

```
ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 33754)>
  if self._get_socket():
ResourceWarning: Enable tracemalloc to get the object allocation traceback
```

Might be related to the Redis server that is supposed to be running
during the tests?!

Again, any idea welcome!

-- 
Tanguy

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Leo Famulari]

On Thu, Mar 12, 2020 at 09:58:22AM +0100, Tanguy Le Carrour wrote:
> Seems that all the `RedisStoreTestCase` are failing with messages like:
> 
> ```
> ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 33754)>
>   if self._get_socket():
> ResourceWarning: Enable tracemalloc to get the object allocation traceback
> ```
> 
> Might be related to the Redis server that is supposed to be running
> during the tests?!

Okay, networking is not possible in the build environment, so for the
tests that depend on connecting to a server, you can add a comment like
"These tests require networking.".

Is that all of them?

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

Le 03/14, Leo Famulari a écrit :
> On Thu, Mar 12, 2020 at 09:58:22AM +0100, Tanguy Le Carrour wrote:
> > Seems that all the `RedisStoreTestCase` are failing with messages like:
> > 
> > ```
> > ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 33754)>
> >   if self._get_socket():
> > ResourceWarning: Enable tracemalloc to get the object allocation traceback
> > ```
> > 
> > Might be related to the Redis server that is supposed to be running
> > during the tests?!
> 
> Okay, networking is not possible in the build environment, so for the
> tests that depend on connecting to a server, you can add a comment like
> "These tests require networking.".

Good to know, thanks!


> Is that all of them?

I guess so! I'll double check, update the patch and submit it!

Thanks!

-- 
Tanguy

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Leo Famulari]

On Thu, Mar 12, 2020 at 09:58:22AM +0100, Tanguy Le Carrour wrote:
> Seems that all the `RedisStoreTestCase` are failing with messages like:
> 
> ```
> ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 33754)>
>   if self._get_socket():
> ResourceWarning: Enable tracemalloc to get the object allocation traceback
> ```

I just got word that networking to localhost *is* possible in the build
environment. So it's not as simple as that in this case. Can you check
if the Redis server is running?

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

Le 03/14, Leo Famulari a écrit :
> On Thu, Mar 12, 2020 at 09:58:22AM +0100, Tanguy Le Carrour wrote:
> > Seems that all the `RedisStoreTestCase` are failing with messages like:
> > 
> > ```
> > ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 33754)>
> >   if self._get_socket():
> > ResourceWarning: Enable tracemalloc to get the object allocation traceback
> > ```
> 
> I just got word that networking to localhost *is* possible in the build
> environment. So it's not as simple as that in this case. Can you check
> if the Redis server is running?

*ARF* should have read all of it! :-(

I'll investigate! Thanks for the advice.

-- 
Tanguy

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

Hi Leo,

Le 03/14, Leo Famulari a écrit :
> On Thu, Mar 12, 2020 at 09:58:22AM +0100, Tanguy Le Carrour wrote:
> > Seems that all the `RedisStoreTestCase` are failing with messages like:
> > 
> > ```
> > ResourceWarning: unclosed <socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('127.0.0.1', 33754)>
> >   if self._get_socket():
> > ResourceWarning: Enable tracemalloc to get the object allocation traceback
> > ```
> 
> I just got word that networking to localhost *is* possible in the build
> environment. So it's not as simple as that in this case. Can you check
> if the Redis server is running?

I checked and this bug has been reported upstream last year and is not
yet fixed.
There's a workaround, but it requires to package `pifpaf` and 5 more
dependencies. I'll eventually do that… later next week!?

In the meantime, I'm pushing v4 of the patch set if you're OK with
disabling the failing tests and adding a comment pointing to the bug report.
If you're not, which is perfectly fine, I've reorganized the stack so that
you could commit the 8 patches up to `python-cachy`.

Regards

-- 
Tanguy

[bug#39777] [PATCH V3 02/11] gnu: python-cachy: Update to 0.3.0.

[Leo Famulari]

On Thu, Mar 19, 2020 at 06:27:05PM +0100, Tanguy Le Carrour wrote:
> In the meantime, I'm pushing v4 of the patch set if you're OK with
> disabling the failing tests and adding a comment pointing to the bug report.
> If you're not, which is perfectly fine, I've reorganized the stack so that
> you could commit the 8 patches up to `python-cachy`.

That sounds fine, thanks!

[bug#39777] [PATCH V3 03/11] gnu: python-fakeredis: Update to 1.2.1.

[Tanguy Le Carrour]

* gnu/packages/databases.scm (python-fakeredis): Update to 1.2.1.
[propagated-inputs]: Add python-sortedcontainers.
---
 gnu/packages/databases.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c8d12f43b5..9d08092d5d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2876,18 +2877,20 @@ parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 (define-public python-fakeredis
   (package
     (name "python-fakeredis")
-    (version "0.8.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "fakeredis" version))
        (sha256
         (base32
-         "0zncahj3byyasyfx9i7k991ph0n0lq8v3a21pqri5qxn9564bk9r"))))
+         "1s12mn4q4hz7402139khn9fx56kibj7nn0d6w81hn0zs07b90wpc"))))
     (build-system python-build-system)
     (arguments
      ;; no tests
      `(#:tests? #f))
+    (propagated-inputs
+      `(("python-sortedcontainers" ,python-sortedcontainers)))
     (home-page "https://github.com/jamesls/fakeredis")
     (synopsis "Fake implementation of redis API for testing purposes")
     (description
-- 
2.25.1

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
[propagated-inputs]: Add python-importlib-metadata.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 82892802ff..d577487b25 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2037,17 +2037,22 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-    (version "3.0.1")
+    (version "3.2.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "jsonschema" version))
              (sha256
               (base32
-               "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc"))))
+               "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-test
+           (lambda _
+             (substitute* "jsonschema/tests/test_cli.py"
+               (("def test_version") "def _test_version"))
+             #t))
          (replace 'check
            (lambda _
              (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
@@ -2057,6 +2062,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
        ("python-twisted" ,python-twisted)))
     (propagated-inputs
      `(("python-attrs" ,python-attrs)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-pyrsistent" ,python-pyrsistent)
        ("python-six" ,python-six)))
     (home-page "https://github.com/Julian/jsonschema")
-- 
2.25.1

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Leo Famulari]

On Mon, Mar 09, 2020 at 09:18:20AM +0100, Tanguy Le Carrour wrote:
> * gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
> [propagated-inputs]: Add python-importlib-metadata.
> [arguments]: Disable failing test.

> +         (add-before 'check 'disable-failing-test
> +           (lambda _
> +             (substitute* "jsonschema/tests/test_cli.py"
> +               (("def test_version") "def _test_version"))
> +             #t))

Again, we need a comment explaining what's wrong with the test.

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

Hi Leo,

Thanks for taking the time to read my patches!


Le 03/11, Leo Famulari a écrit :
> On Mon, Mar 09, 2020 at 09:18:20AM +0100, Tanguy Le Carrour wrote:
> > * gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
> > [propagated-inputs]: Add python-importlib-metadata.
> > [arguments]: Disable failing test.
> 
> > +         (add-before 'check 'disable-failing-test
> > +           (lambda _
> > +             (substitute* "jsonschema/tests/test_cli.py"
> > +               (("def test_version") "def _test_version"))
> > +             #t))
> 
> Again, we need a comment explaining what's wrong with the test.

My bad! Sorry!
I started investigating when I submitted the patch, but… well… I haven't
found a fix yet and I'm not sure who to blame!

The test relies on a call to `subprocess.check_output` to run
`python -m jsonschema --version`, but it behaves like `--version` was
never passed to the command?!

```
145     def test_version(self):
146         version = subprocess.check_output(
147             [sys.executable, "-m", "jsonschema", "--version"],
148             stderr=subprocess.STDOUT,
149         )
```

Replacing `check_output` with `check_call` shows the actual error message:

```
usage: __main__.py [-h] [-i INSTANCES] [-F ERROR_FORMAT] [-V VALIDATOR] schema
__main__.py: error: the following arguments are required: schema
```

Doesn't really look like a problem with jsonschema to me, and… I would not dare
blaming python. ^_^'

Any idea welcome!

-- 
Tanguy

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Leo Famulari]

On Thu, Mar 12, 2020 at 09:48:28AM +0100, Tanguy Le Carrour wrote:
> The test relies on a call to `subprocess.check_output` to run
> `python -m jsonschema --version`, but it behaves like `--version` was
> never passed to the command?!

How do you know it behaves like that? Is there some error output?

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

Le 03/12, Leo Famulari a écrit :
> On Thu, Mar 12, 2020 at 09:48:28AM +0100, Tanguy Le Carrour wrote:
> > The test relies on a call to `subprocess.check_output` to run
> > `python -m jsonschema --version`, but it behaves like `--version` was
> > never passed to the command?!
> 
> How do you know it behaves like that? Is there some error output?

Actually, you're right, I don't know, because I didn't reproduce the exact same
error!

```
$ ./pre-inst-env guix build python-jsonschema -K
[…]
subprocess.CalledProcessError: Command '['/gnu/store/l8nphg0idd8pfddyad8f92lx8d1hc053-python-wrapper-3.7.4/bin/python', '-m', 'jsonschema', '--version']' returned non-zero exit status 1.
```

The exit status is 1.

To reproduce it in the build directory I did the following:

```
$ cd /tmp/guix-build-python-jsonschema-3.2.0.drv-0/jsonschema-3.2.0/
$ guix environment python-jsonschema --ad-hoc python-importlib-metadata
$ set -x PYTHONPATH .:$PYTHONPATH # I'm using Fish
$ trial jsonschema/tests/test_cli.py                                                                                                                                                                                              [env] GUIX
jsonschema.tests.test_cli
  TestCLI
    test_draft3_schema_draft4_validator ...                                [OK]
    test_successful_validation ...                                         [OK]
    test_unsuccessful_validation ...                                       [OK]
    test_unsuccessful_validation_multiple_instances ...                    [OK]
    test_version ...                                                    [ERROR]

===============================================================================
[ERROR]
Traceback (most recent call last):
[…]
subprocess.CalledProcessError: Command '['/gnu/store/m4kgg8z52kn6xspmd3brvivd129d4i3s-python-wrapper-3.7.4/bin/python', '-m', 'jsonschema', '--version']' returned non-zero exit status 2.
```

But the exit status was… 2! Which I didn't pay attention at first.

Then, I modified the code of the test to add some log:

```
$ trial jsonschema/tests/test_cli.py                                                                       [env] GUIX
jsonschema.tests.test_cli
  TestCLI
    test_draft3_schema_draft4_validator ...                                [OK]
    test_successful_validation ...                                         [OK]
    test_unsuccessful_validation ...                                       [OK]
    test_unsuccessful_validation_multiple_instances ...                    [OK]
    test_version ... usage: __main__.py [-h] [-i INSTANCES] [-F ERROR_FORMAT] [-V VALIDATOR] schema
__main__.py: error: the following arguments are required: schema
                                                   [ERROR]
```

This error message in the output is the one I would get by calling
`python -m jsonschema` without `--version`.

This was the end of my investigation and… a mistake! ^_^'

Right after your question, I tried to do the same but directly from my package
definition by adding a `substitute`:

```
(add-before 'check 'replace-check-output
  (lambda _
          (substitute* "jsonschema/tests/test_cli.py"
            (("check_output") "check_call"))
          #t))
```

Re-built the package and… got the exit status 1 with a different error message
in the log:

```
jsonschema.tests.test_cli
  TestCLI
    test_draft3_schema_draft4_validator ...                                [OK]
    test_successful_validation ...                                         [OK]
    test_unsuccessful_validation ...                                       [OK]
    test_unsuccessful_validation_multiple_instances ...                    [OK]
    test_version ... /gnu/store/l8nphg0idd8pfddyad8f92lx8d1hc053-python-wrapper-3.7.4/bin/python: No module named jsonschema
                                                   [ERROR]
===============================================================================
[ERROR]
Traceback (most recent call last):
[…]
subprocess.CalledProcessError: Command '['/gnu/store/l8nphg0idd8pfddyad8f92lx8d1hc053-python-wrapper-3.7.4/bin/python', '-m', 'jsonschema', '--version']' returned non-zero exit status 1.
```

So, I'm left with the same question:
 - why does it fail with `No module named jsonschema`? and with a second one
 - why wasn't I able to reproduce the error from the build directory?!

I still have a lot to learn! :-(
Any help welcome!

-- 
Tanguy

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Leo Famulari]

On Fri, Mar 13, 2020 at 09:45:41AM +0100, Tanguy Le Carrour wrote:
> So, I'm left with the same question:
>  - why does it fail with `No module named jsonschema`? and with a second one

I'm not sure, I'm not that strong with Python.

>  - why wasn't I able to reproduce the error from the build directory?!

There are lots of things that could have changed.

First, I would use `guix environment --pure` to try isolating the rest
of the system, beginning to approximate the build chroot. You could even
try `guix environment --container` if your system supports it.

Second, the tests might be idempotent.

You'll have a hard time reproducing the build environment exactly but
it's usually possible to figure out why the test is failing.

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Leo Famulari]

On Fri, Mar 13, 2020 at 09:45:41AM +0100, Tanguy Le Carrour wrote:
> Re-built the package and… got the exit status 1 with a different error message
> in the log:
> 
> ```
> jsonschema.tests.test_cli
>   TestCLI
>     test_draft3_schema_draft4_validator ...                                [OK]
>     test_successful_validation ...                                         [OK]
>     test_unsuccessful_validation ...                                       [OK]
>     test_unsuccessful_validation_multiple_instances ...                    [OK]
>     test_version ... /gnu/store/l8nphg0idd8pfddyad8f92lx8d1hc053-python-wrapper-3.7.4/bin/python: No module named jsonschema
>                                                    [ERROR]
> ===============================================================================

My understanding is that the test suite of jsonschema can't find
jsonschema. Is that correct? If so, you should look into the
add-installed-pythonpath procedure and some examples of how it's used.

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

Le 03/14, Leo Famulari a écrit :
> On Fri, Mar 13, 2020 at 09:45:41AM +0100, Tanguy Le Carrour wrote:
> > Re-built the package and… got the exit status 1 with a different error message
> > in the log:
> > 
> > ```
> > jsonschema.tests.test_cli
> >   TestCLI
> >     test_draft3_schema_draft4_validator ...                                [OK]
> >     test_successful_validation ...                                         [OK]
> >     test_unsuccessful_validation ...                                       [OK]
> >     test_unsuccessful_validation_multiple_instances ...                    [OK]
> >     test_version ... /gnu/store/l8nphg0idd8pfddyad8f92lx8d1hc053-python-wrapper-3.7.4/bin/python: No module named jsonschema
> >                                                    [ERROR]
> > ===============================================================================
> 
> My understanding is that the test suite of jsonschema can't find
> jsonschema. Is that correct? If so, you should look into the
> add-installed-pythonpath procedure and some examples of how it's used.

I'll do that! Thanks!

-- 
Tanguy

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

Hi Leo,

Le 03/14, Tanguy Le Carrour a écrit :
> Le 03/14, Leo Famulari a écrit :
> > On Fri, Mar 13, 2020 at 09:45:41AM +0100, Tanguy Le Carrour wrote:
> > > Re-built the package and… got the exit status 1 with a different error message
> > > in the log:
> > > 
> > > ```
> > > jsonschema.tests.test_cli
> > >   TestCLI
> > >     test_draft3_schema_draft4_validator ...                                [OK]
> > >     test_successful_validation ...                                         [OK]
> > >     test_unsuccessful_validation ...                                       [OK]
> > >     test_unsuccessful_validation_multiple_instances ...                    [OK]
> > >     test_version ... /gnu/store/l8nphg0idd8pfddyad8f92lx8d1hc053-python-wrapper-3.7.4/bin/python: No module named jsonschema
> > >                                                    [ERROR]
> > > ===============================================================================
> > 
> > My understanding is that the test suite of jsonschema can't find
> > jsonschema. Is that correct? If so, you should look into the
> > add-installed-pythonpath procedure and some examples of how it's used.
> 
> I'll do that! Thanks!

It solved the problem! Thanks! I'm moving to fixing the cachy/redis problem
now, and I'll submit a v4 patch set once it's done!

Regards

-- 
Tanguy

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Leo Famulari]

On Thu, Mar 19, 2020 at 08:42:16AM +0100, Tanguy Le Carrour wrote:
> It solved the problem! Thanks! I'm moving to fixing the cachy/redis problem
> now, and I'll submit a v4 patch set once it's done!

I'm glad to hear it, thanks!

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

Le 03/20, Leo Famulari a écrit :
> On Thu, Mar 19, 2020 at 08:42:16AM +0100, Tanguy Le Carrour wrote:
> > It solved the problem! Thanks! I'm moving to fixing the cachy/redis problem
> > now, and I'll submit a v4 patch set once it's done!
> 
> I'm glad to hear it, thanks!

Thanks to you for (kindly) pushing the contributors to keep the package quality
as high as possible! :-)

-- 
Tanguy

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Leo Famulari]

On Sat, Mar 21, 2020 at 09:50:25AM +0100, Tanguy Le Carrour wrote:
> Thanks to you for (kindly) pushing the contributors to keep the package quality
> as high as possible! :-)

It's important to find the right balance. I don't want to push
contributors away. Please tell us if you think we are being
unreasonable!

[bug#39777] [PATCH V3 04/11] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

Hi Leo,


Le 03/22, Leo Famulari a écrit :
> On Sat, Mar 21, 2020 at 09:50:25AM +0100, Tanguy Le Carrour wrote:
> > Thanks to you for (kindly) pushing the contributors to keep the package quality
> > as high as possible! :-)
> 
> It's important to find the right balance. I don't want to push
> contributors away. Please tell us if you think we are being
> unreasonable!

I really appriciate that you guys take the time to read and discuss
contributr's code.

And you won't scare me away from the project by being picky, honest and polite!
;-)

Best regards


-- 
Tanguy

[bug#39777] [PATCH V3 05/11] gnu: python-pastel: Update to 0.2.0.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c30f23d921..d474a06897 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -833,14 +833,14 @@ rendering SVG graphics.")
 (define-public python-pastel
   (package
     (name "python-pastel")
-    (version "0.1.1")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pastel" version))
        (sha256
         (base32
-         "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz"))))
+         "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.25.1

[bug#39777] [PATCH V3 06/11] gnu: python-msgpack: Update to 1.0.0.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d577487b25..58b78f967f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7105,13 +7105,13 @@ should be stored on various operating systems.")
 (define-public python-msgpack
   (package
     (name "python-msgpack")
-    (version "0.5.6")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "msgpack" version))
               (sha256
                (base32
-                "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f"))))
+                "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m"))))
     (build-system python-build-system)
     (arguments
      `(#:modules ((guix build utils)
-- 
2.25.1

[bug#39777] [PATCH V3 07/11] gnu: python-cachecontrol: Add missing propagated-input.

[Tanguy Le Carrour]

* gnu/packages/python-web.scm (python-cachecontrol):
[propagated-inputs]: Add python-msgpack.
---
 gnu/packages/python-web.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d294e43d45..214a98522f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2037,6 +2037,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients."
      `(#:tests? #f))
     (propagated-inputs
      `(("python-requests" ,python-requests)
+       ("python-msgpack" ,python-msgpack)
        ("python-lockfile" ,python-lockfile)))
     (home-page "https://github.com/ionrock/cachecontrol")
     (synopsis "The httplib2 caching algorithms for use with requests")
-- 
2.25.1

[bug#39777] [PATCH V3 08/11] gnu: python-sortedcontainers: Add missing propagated-inputs.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-sortedcontainers):
[propagated-inputs] Add python-appdirs, python-distlib, python-filelock,
python-importlib-metadata and python-six.
---
 gnu/packages/python-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 58b78f967f..199abcd445 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16206,6 +16206,12 @@ that is accessible to other projects developed in Cython.")
     (build-system python-build-system)
     (native-inputs
      `(("python-tox" ,python-tox)))
+    (propagated-inputs
+     `(("python-appdirs" ,python-appdirs)
+       ("python-distlib" ,python-distlib)
+       ("python-filelock" ,python-filelock)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
+       ("python-six" ,python-six)))
     (home-page "http://www.grantjenks.com/docs/sortedcontainers/")
     (synopsis "Sorted List, Sorted Dict, Sorted Set")
     (description
-- 
2.25.1

[bug#39777] [PATCH V3 09/11] gnu: python-tomlkit: Update to 0.5.11.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 199abcd445..65f0780ab8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10712,14 +10712,14 @@ docstring and colored output.")
 (define-public python-tomlkit
   (package
     (name "python-tomlkit")
-    (version "0.5.8")
+    (version "0.5.11")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tomlkit" version))
        (sha256
         (base32
-         "0sf2a4q61kf344hjbw8kb6za1hlccl89j9lzqw0l2zpddp0hrh9j"))))
+         "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-pytest" ,python-pytest)))
-- 
2.25.1

[bug#39777] [PATCH V3 10/11] gnu: python-clikit: Update to 0.4.2.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 65f0780ab8..e8ef628ad4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10779,14 +10779,14 @@ more, possibly remote, memcached servers.")
 (define-public python-clikit
   (package
     (name "python-clikit")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "clikit" version))
        (sha256
         (base32
-         "10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a"))))
+         "1jnnr21hvzx4i29nbph1z96ympv0njiwyvngjq48w1q05133cwzn"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pastel" ,python-pastel)
-- 
2.25.1

[bug#39777] [PATCH V3 11/11] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (poetry): Update to 1.0.5.
[propagated-inputs] Add python-clikit, add python-importlib-metadata,
add python-keyring, add python-pexpect, remove python-msgpack,
remove python-glob2.  [home-page] Update URL.
[arguments] Remove distutils patch, patch versions of keyring
and importlib-metadata.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e8ef628ad4..fccfa45d46 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10864,34 +10864,36 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
 (define-public poetry
   (package
     (name "poetry")
-    (version "0.12.17")
-    ;; Poetry can only be built from source with poetry.
+    (version "1.0.5")
+    ;; Poetry can only be built from source with Poetry.
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "poetry" version))
        (sha256
         (base32
-         "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"))))
+         "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ;; Pypi does not have tests.
        #:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'patch-setup-py
            (lambda _
-             ;; Bug in poetry https://github.com/sdispater/poetry/issues/866.
-             (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/"
-                     "setup.py")
+             (substitute* "setup.py"
+               (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6
+               (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0"))
              #t)))))
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol)
        ("python-cachy" ,python-cachy)
        ("python-cleo" ,python-cleo)
-       ("python-glob2" ,python-glob2)
+       ("python-clikit" ,python-clikit)
        ("python-html5lib" ,python-html5lib)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-jsonschema" ,python-jsonschema)
-       ("python-msgpack" ,python-msgpack)
+       ("python-keyring" ,python-keyring)
+       ("python-pexpect" ,python-pexpect)
        ("python-pkginfo" ,python-pkginfo)
        ("python-pyparsing" ,python-pyparsing)
        ("python-pyrsistent" ,python-pyrsistent)
@@ -10900,7 +10902,7 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
        ("python-shellingham" ,python-shellingham)
        ("python-tomlkit" ,python-tomlkit)
        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://poetry.eustace.io/")
+    (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
 in Python.  It allows you to declare the libraries your project depends on and
-- 
2.25.1

[bug#39777] [PATCH V4 01/10] gnu: python-pexpect: Update to 4.8.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-pexpect): Update to 4.8.0.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 86e87ae4dc..d298f3dc19 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5315,13 +5315,13 @@ displayed.")
 (define-public python-pexpect
   (package
     (name "python-pexpect")
-    (version "4.6.0")
+    (version "4.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pexpect" version))
        (sha256
-        (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia"))))
+        (base32 "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -5335,7 +5335,10 @@ displayed.")
                ;; Many tests try to use the /bin directory which
                ;; is not present in the build environment.
                ;; Use one that's non-empty and unlikely to change.
-               (("/bin'") "/dev'"))
+               (("/bin'") "/dev'")
+               ;; Disable failing test.  See upstream bug report
+               ;; https://github.com/pexpect/pexpect/issues/568
+               (("def test_bash") "def _test_bash"))
              ;; XXX: Socket connection test gets "Connection reset by peer".
              ;; Why does it not work? Delete for now.
              (delete-file "tests/test_socket.py")
-- 
2.25.1

[bug#39777] [PATCH V4 02/10] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
[propagated-inputs]: Add python-importlib-metadata.
[arguments]: Use add-installed-pythonpath to make a test pass.
---
 gnu/packages/python-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d298f3dc19..56f4976ff5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2269,19 +2269,20 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-    (version "3.0.1")
+    (version "3.2.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "jsonschema" version))
              (sha256
               (base32
-               "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc"))))
+               "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (add-installed-pythonpath inputs outputs)
              (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
              (invoke "trial" "jsonschema"))))))
     (native-inputs
@@ -2289,6 +2290,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
        ("python-twisted" ,python-twisted)))
     (propagated-inputs
      `(("python-attrs" ,python-attrs)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-pyrsistent" ,python-pyrsistent)
        ("python-six" ,python-six)))
     (home-page "https://github.com/Julian/jsonschema")
-- 
2.25.1

[bug#39777] [PATCH V4 03/10] gnu: python-pastel: Update to 0.2.0.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2d50a5f539..88ac85f5c8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -834,14 +834,14 @@ rendering SVG graphics.")
 (define-public python-pastel
   (package
     (name "python-pastel")
-    (version "0.1.1")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pastel" version))
        (sha256
         (base32
-         "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz"))))
+         "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.25.1

[bug#39777] [PATCH V4 04/10] gnu: python-msgpack: Update to 1.0.0.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 56f4976ff5..30cedf9506 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7411,13 +7411,13 @@ should be stored on various operating systems.")
 (define-public python-msgpack
   (package
     (name "python-msgpack")
-    (version "0.5.6")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "msgpack" version))
               (sha256
                (base32
-                "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f"))))
+                "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m"))))
     (build-system python-build-system)
     (arguments
      `(#:modules ((guix build utils)
-- 
2.25.1

[bug#39777] [PATCH V4 05/10] gnu: python-cachecontrol: Add missing propagated-input.

[Tanguy Le Carrour]

* gnu/packages/python-web.scm (python-cachecontrol):
[propagated-inputs]: Add python-msgpack.
---
 gnu/packages/python-web.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b02ffd5f58..2cc4bc270f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2036,6 +2036,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients."
      `(#:tests? #f))
     (propagated-inputs
      `(("python-requests" ,python-requests)
+       ("python-msgpack" ,python-msgpack)
        ("python-lockfile" ,python-lockfile)))
     (home-page "https://github.com/ionrock/cachecontrol")
     (synopsis "The httplib2 caching algorithms for use with requests")
-- 
2.25.1

[bug#39777] [PATCH V4 06/10] gnu: python-sortedcontainers: Add missing propagated-inputs.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-sortedcontainers):
[propagated-inputs] Add python-appdirs, python-distlib, python-filelock,
python-importlib-metadata and python-six.
---
 gnu/packages/python-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 30cedf9506..6bfbde98f3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16554,6 +16554,12 @@ that is accessible to other projects developed in Cython.")
     (build-system python-build-system)
     (native-inputs
      `(("python-tox" ,python-tox)))
+    (propagated-inputs
+     `(("python-appdirs" ,python-appdirs)
+       ("python-distlib" ,python-distlib)
+       ("python-filelock" ,python-filelock)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
+       ("python-six" ,python-six)))
     (home-page "http://www.grantjenks.com/docs/sortedcontainers/")
     (synopsis "Sorted List, Sorted Dict, Sorted Set")
     (description
-- 
2.25.1

[bug#39777] [PATCH V4 07/10] gnu: python-clikit: Update to 0.4.2.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6bfbde98f3..ee9b01417c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11127,14 +11127,14 @@ more, possibly remote, memcached servers.")
 (define-public python-clikit
   (package
     (name "python-clikit")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "clikit" version))
        (sha256
         (base32
-         "10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a"))))
+         "1jnnr21hvzx4i29nbph1z96ympv0njiwyvngjq48w1q05133cwzn"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pastel" ,python-pastel)
-- 
2.25.1

[bug#39777] [PATCH V4 08/10] gnu: python-fakeredis: Update to 1.2.1.

[Tanguy Le Carrour]

* gnu/packages/databases.scm (python-fakeredis): Update to 1.2.1.
[propagated-inputs]: Add python-sortedcontainers.
---
 gnu/packages/databases.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 5727905beb..050ffc245d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2887,18 +2888,20 @@ parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 (define-public python-fakeredis
   (package
     (name "python-fakeredis")
-    (version "0.8.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "fakeredis" version))
        (sha256
         (base32
-         "0zncahj3byyasyfx9i7k991ph0n0lq8v3a21pqri5qxn9564bk9r"))))
+         "1s12mn4q4hz7402139khn9fx56kibj7nn0d6w81hn0zs07b90wpc"))))
     (build-system python-build-system)
     (arguments
      ;; no tests
      `(#:tests? #f))
+    (propagated-inputs
+      `(("python-sortedcontainers" ,python-sortedcontainers)))
     (home-page "https://github.com/jamesls/fakeredis")
     (synopsis "Fake implementation of redis API for testing purposes")
     (description
-- 
2.25.1

[bug#39777] [PATCH V4 09/10] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
[arguments]: Disable failing tests.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ee9b01417c..a06d6161a8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11170,15 +11170,31 @@ strings require only one extra byte in addition to the strings themselves.")
 (define-public python-cachy
   (package
     (name "python-cachy")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cachy" version))
        (sha256
         (base32
-         "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"))))
+         "1cb9naly8ampzlky7h74n5wj628l7jkpsh0c0jz0namlrvs82r8q"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-failing-tests
+           (lambda _
+             ;; Disable failing test.  See upstream bug report
+             ;; https://github.com/sdispater/cachy/issues/5
+             (substitute* "tests/stores/test_memcached_store.py"
+               (("def test_forever") "def _test_forever")
+               (("def test_increment") "def _test_increment")
+               (("def test_decrement") "def _test_decrement")
+               (("def test_put_numeric_value") "def _test_put_numeric_value")
+               (("def test_put_value_into_memcache") "def _test_put_value_into_memcache")
+               (("def test_value_is_returned") "def _test_value_is_returned")
+               (("def test_value_is_returned_for_numerics") "def _test_value_is_returned_for_numerics"))
+             #t)))))
     (native-inputs
      `(("python-fakeredis" ,python-fakeredis)
        ("python-flexmock" ,python-flexmock)
-- 
2.25.1

[bug#39777] [PATCH V4 10/10] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (poetry): Update to 1.0.5.
[propagated-inputs] Add python-clikit, add python-importlib-metadata,
add python-keyring, add python-pexpect, remove python-msgpack,
remove python-glob2.  [home-page] Update URL.
[arguments] Remove distutils patch, patch versions of keyring
and importlib-metadata.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a06d6161a8..eba8d3a478 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11214,34 +11214,36 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
 (define-public poetry
   (package
     (name "poetry")
-    (version "0.12.17")
-    ;; Poetry can only be built from source with poetry.
+    (version "1.0.5")
+    ;; Poetry can only be built from source with Poetry.
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "poetry" version))
        (sha256
         (base32
-         "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"))))
+         "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ;; Pypi does not have tests.
        #:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'patch-setup-py
            (lambda _
-             ;; Bug in poetry https://github.com/sdispater/poetry/issues/866.
-             (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/"
-                     "setup.py")
+             (substitute* "setup.py"
+               (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6
+               (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0"))
              #t)))))
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol)
        ("python-cachy" ,python-cachy)
        ("python-cleo" ,python-cleo)
-       ("python-glob2" ,python-glob2)
+       ("python-clikit" ,python-clikit)
        ("python-html5lib" ,python-html5lib)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-jsonschema" ,python-jsonschema)
-       ("python-msgpack" ,python-msgpack)
+       ("python-keyring" ,python-keyring)
+       ("python-pexpect" ,python-pexpect)
        ("python-pkginfo" ,python-pkginfo)
        ("python-pyparsing" ,python-pyparsing)
        ("python-pyrsistent" ,python-pyrsistent)
@@ -11250,7 +11252,7 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
        ("python-shellingham" ,python-shellingham)
        ("python-tomlkit" ,python-tomlkit)
        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://poetry.eustace.io/")
+    (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
 in Python.  It allows you to declare the libraries your project depends on and
-- 
2.25.1

[bug#39777] [PATCH V5 0/14] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

Hi Leo!

I fixed the cachy test problem using pifpaf. The following V5 contains 4
new packages and the modified python-cachy.

Regards

-- 
Tanguy

[bug#39777] [PATCH V5 01/14] gnu: python-pexpect: Update to 4.8.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-pexpect): Update to 4.8.0.
[arguments]: Disable failing test.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3937bad5c3..60ee761d4b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5337,13 +5337,13 @@ displayed.")
 (define-public python-pexpect
   (package
     (name "python-pexpect")
-    (version "4.6.0")
+    (version "4.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pexpect" version))
        (sha256
-        (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia"))))
+        (base32 "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -5357,7 +5357,10 @@ displayed.")
                ;; Many tests try to use the /bin directory which
                ;; is not present in the build environment.
                ;; Use one that's non-empty and unlikely to change.
-               (("/bin'") "/dev'"))
+               (("/bin'") "/dev'")
+               ;; Disable failing test.  See upstream bug report
+               ;; https://github.com/pexpect/pexpect/issues/568
+               (("def test_bash") "def _test_bash"))
              ;; XXX: Socket connection test gets "Connection reset by peer".
              ;; Why does it not work? Delete for now.
              (delete-file "tests/test_socket.py")
-- 
2.25.2

[bug#39777] [PATCH V5 02/14] gnu: python-jsonschema: Update to 3.2.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0.
[propagated-inputs]: Add python-importlib-metadata.
[arguments]: Use add-installed-pythonpath to make a test pass.
---
 gnu/packages/python-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 60ee761d4b..3290b07017 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2269,19 +2269,20 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-    (version "3.0.1")
+    (version "3.2.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "jsonschema" version))
              (sha256
               (base32
-               "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc"))))
+               "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (add-installed-pythonpath inputs outputs)
              (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH")))
              (invoke "trial" "jsonschema"))))))
     (native-inputs
@@ -2289,6 +2290,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
        ("python-twisted" ,python-twisted)))
     (propagated-inputs
      `(("python-attrs" ,python-attrs)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-pyrsistent" ,python-pyrsistent)
        ("python-six" ,python-six)))
     (home-page "https://github.com/Julian/jsonschema")
-- 
2.25.2

[bug#39777] [PATCH V5 03/14] gnu: python-pastel: Update to 0.2.0.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2d50a5f539..88ac85f5c8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -834,14 +834,14 @@ rendering SVG graphics.")
 (define-public python-pastel
   (package
     (name "python-pastel")
-    (version "0.1.1")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pastel" version))
        (sha256
         (base32
-         "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz"))))
+         "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.25.2

[bug#39777] [PATCH V5 04/14] gnu: python-msgpack: Update to 1.0.0.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3290b07017..861772bcb9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7433,13 +7433,13 @@ should be stored on various operating systems.")
 (define-public python-msgpack
   (package
     (name "python-msgpack")
-    (version "0.5.6")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "msgpack" version))
               (sha256
                (base32
-                "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f"))))
+                "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m"))))
     (build-system python-build-system)
     (arguments
      `(#:modules ((guix build utils)
-- 
2.25.2

[bug#39777] [PATCH V5 05/14] gnu: python-cachecontrol: Add missing propagated-input.

[Tanguy Le Carrour]

* gnu/packages/python-web.scm (python-cachecontrol):
[propagated-inputs]: Add python-msgpack.
---
 gnu/packages/python-web.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b02ffd5f58..2cc4bc270f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2036,6 +2036,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients."
      `(#:tests? #f))
     (propagated-inputs
      `(("python-requests" ,python-requests)
+       ("python-msgpack" ,python-msgpack)
        ("python-lockfile" ,python-lockfile)))
     (home-page "https://github.com/ionrock/cachecontrol")
     (synopsis "The httplib2 caching algorithms for use with requests")
-- 
2.25.2

[bug#39777] [PATCH V5 06/14] gnu: python-sortedcontainers: Add missing propagated-inputs.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-sortedcontainers):
[propagated-inputs] Add python-appdirs, python-distlib, python-filelock,
python-importlib-metadata and python-six.
---
 gnu/packages/python-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 861772bcb9..bdc737aa68 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16683,6 +16683,12 @@ that is accessible to other projects developed in Cython.")
     (build-system python-build-system)
     (native-inputs
      `(("python-tox" ,python-tox)))
+    (propagated-inputs
+     `(("python-appdirs" ,python-appdirs)
+       ("python-distlib" ,python-distlib)
+       ("python-filelock" ,python-filelock)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
+       ("python-six" ,python-six)))
     (home-page "http://www.grantjenks.com/docs/sortedcontainers/")
     (synopsis "Sorted List, Sorted Dict, Sorted Set")
     (description
-- 
2.25.2

[bug#39777] [PATCH V5 07/14] gnu: python-clikit: Update to 0.4.2.

[Tanguy Le Carrour]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bdc737aa68..f5a8a21d55 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11149,14 +11149,14 @@ more, possibly remote, memcached servers.")
 (define-public python-clikit
   (package
     (name "python-clikit")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "clikit" version))
        (sha256
         (base32
-         "10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a"))))
+         "1jnnr21hvzx4i29nbph1z96ympv0njiwyvngjq48w1q05133cwzn"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pastel" ,python-pastel)
-- 
2.25.2

[bug#39777] [PATCH V5 08/14] gnu: python-fakeredis: Update to 1.2.1.

[Tanguy Le Carrour]

* gnu/packages/databases.scm (python-fakeredis): Update to 1.2.1.
[propagated-inputs]: Add python-sortedcontainers.
---
 gnu/packages/databases.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index a347467ad1..b8c6623ceb 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2873,18 +2874,20 @@ parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 (define-public python-fakeredis
   (package
     (name "python-fakeredis")
-    (version "0.8.2")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "fakeredis" version))
        (sha256
         (base32
-         "0zncahj3byyasyfx9i7k991ph0n0lq8v3a21pqri5qxn9564bk9r"))))
+         "1s12mn4q4hz7402139khn9fx56kibj7nn0d6w81hn0zs07b90wpc"))))
     (build-system python-build-system)
     (arguments
      ;; no tests
      `(#:tests? #f))
+    (propagated-inputs
+      `(("python-sortedcontainers" ,python-sortedcontainers)))
     (home-page "https://github.com/jamesls/fakeredis")
     (synopsis "Fake implementation of redis API for testing purposes")
     (description
-- 
2.25.2

[bug#39777] [PATCH V5 09/14] gnu: Add python-xattr.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-xattr): New public variable.
---
 gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f5a8a21d55..e27fea1957 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18389,3 +18389,26 @@ sequences.")
 
 (define-public python2-fuzzywuzzy
   (package-with-python2 python-fuzzywuzzy))
+
+(define-public python-xattr
+  (package
+    (name "python-xattr")
+    (version "0.9.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "xattr" version))
+       (sha256
+        (base32
+         "0i4xyiqbhjz2g16zbim17zjdbjkw79xsw8k59942vvq4is1cmfxh"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-cffi" ,python-cffi)))
+    (home-page "http://github.com/xattr/xattr")
+    (synopsis
+     "Python wrapper for extended filesystem attributes")
+    (description "xattr is a Python wrapper for extended filesystem
+attributes.  Extended attributes extend the basic attributes of files
+and directories in the file system.  They are stored as name:data pairs
+associated with file system objects (files, directories, symlinks, etc).")
+    (license license:expat)))
-- 
2.25.2

[bug#39777] [PATCH V5 10/14] gnu: Add python-json-logger.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-json-logger): New public variable.
---
 gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e27fea1957..33d41a294c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18412,3 +18412,24 @@ attributes.  Extended attributes extend the basic attributes of files
 and directories in the file system.  They are stored as name:data pairs
 associated with file system objects (files, directories, symlinks, etc).")
     (license license:expat)))
+
+(define-public python-json-logger
+  (package
+    (name "python-json-logger")
+    (version "0.1.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "python-json-logger" version))
+       (sha256
+        (base32
+         "10g2ya6nsvn5vxzvq2wb8q4d43i3d7756i5rxyjna6d0y9i138xp"))))
+    (build-system python-build-system)
+    (home-page
+     "http://github.com/madzak/python-json-logger")
+    (synopsis
+     "A python library adding a json log formatter")
+    (description "This library is provided to allow standard python logging to
+output log data as json objects.  With JSON we can make our logs more readable
+by machines and we can stop writing custom parsers for syslog type records.")
+    (license license:bsd-3)))
-- 
2.25.2

[bug#39777] [PATCH V5 11/14] gnu: Add python-daiquiri.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-daiquiri): New public variable.
---
 gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 33d41a294c..00b031878a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18433,3 +18433,29 @@ associated with file system objects (files, directories, symlinks, etc).")
 output log data as json objects.  With JSON we can make our logs more readable
 by machines and we can stop writing custom parsers for syslog type records.")
     (license license:bsd-3)))
+
+(define-public python-daiquiri
+  (package
+    (name "python-daiquiri")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "daiquiri" version))
+       (sha256
+        (base32
+         "1qmank3c217ddiig3xr8ps0mqaydcp0q5a62in9a9g4zf72zjnqd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-json-logger" ,python-json-logger)))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)
+       ("python-setuptools-scm" ,python-setuptools-scm)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/jd/daiquiri")
+    (synopsis
+     "Library to configure Python logging easily")
+    (description "The daiquiri library provides an easy way to configure
+logging.  It also provides some custom formatters and handlers.")
+    (license license:asl2.0)))
-- 
2.25.2

[bug#39777] [PATCH V5 12/14] gnu: Add python-pifpaf.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-pifpaf): New public variable.
---
 gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 00b031878a..baaefe8552 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18459,3 +18459,41 @@ by machines and we can stop writing custom parsers for syslog type records.")
     (description "The daiquiri library provides an easy way to configure
 logging.  It also provides some custom formatters and handlers.")
     (license license:asl2.0)))
+
+(define-public python-pifpaf
+  (package
+    (name "python-pifpaf")
+    (version "2.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pifpaf" version))
+       (sha256
+        (base32
+         "150av2pylsjy8ykrpyi0vzy2q24s9rhh2ya01zvwnvj9j5dspviz"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))
+    (propagated-inputs
+     `(("python-click" ,python-click)
+       ("python-daiquiri" ,python-daiquiri)
+       ("python-fixtures" ,python-fixtures)
+       ("python-jinja2" ,python-jinja2)
+       ("python-pbr" ,python-pbr)
+       ("python-psutil" ,python-psutil)
+       ("python-six" ,python-six)
+       ("python-xattr" ,python-xattr)))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-os-testr" ,python-os-testr)
+       ("python-requests" ,python-requests)
+       ("python-testrepository" ,python-testrepository)
+       ("python-testtools" ,python-testtools)))
+    (home-page "https://github.com/jd/pifpaf")
+    (synopsis
+     "Suite of tools and fixtures to manage daemons for testing")
+    (description "Pifpaf is a suite of fixtures and a command-line tool that
+allows to start and stop daemons for a quick throw-away usage.  This is typically
+useful when needing these daemons to run integration testing.  It originaly
+evolved from its precussor overtest.")
+    (license license:asl2.0)))
-- 
2.25.2

[bug#39777] [PATCH V5 13/14] gnu: python-cachy: Update to 0.3.0.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0.
[arguments]: Run checks using pifpaf. [native-inputs]: Add memcached and
python-pifpaf.
---
 gnu/packages/python-xyz.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index baaefe8552..f036b66aba 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11202,18 +11202,25 @@ strings require only one extra byte in addition to the strings themselves.")
 (define-public python-cachy
   (package
     (name "python-cachy")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cachy" version))
        (sha256
         (base32
-         "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"))))
+         "1cb9naly8ampzlky7h74n5wj628l7jkpsh0c0jz0namlrvs82r8q"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+             (lambda _ (invoke "pifpaf" "run" "memcached" "--port" "11211" "--" "pytest"))))))
     (native-inputs
-     `(("python-fakeredis" ,python-fakeredis)
+     `(("memcached" ,memcached)
+       ("python-fakeredis" ,python-fakeredis)
        ("python-flexmock" ,python-flexmock)
+       ("python-pifpaf" ,python-pifpaf)
        ("python-pytest" ,python-pytest)))
     (propagated-inputs
      `(("python-memcached" ,python-memcached)
-- 
2.25.2

[bug#39777] [PATCH V5 14/14] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (poetry): Update to 1.0.5.
[propagated-inputs] Add python-clikit, add python-importlib-metadata,
add python-keyring, add python-pexpect, remove python-msgpack,
remove python-glob2.  [home-page] Update URL.
[arguments] Remove distutils patch, patch versions of keyring
and importlib-metadata.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f036b66aba..79b1bf7e77 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11237,34 +11237,36 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
 (define-public poetry
   (package
     (name "poetry")
-    (version "0.12.17")
-    ;; Poetry can only be built from source with poetry.
+    (version "1.0.5")
+    ;; Poetry can only be built from source with Poetry.
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "poetry" version))
        (sha256
         (base32
-         "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"))))
+         "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ;; Pypi does not have tests.
        #:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'patch-setup-py
            (lambda _
-             ;; Bug in poetry https://github.com/sdispater/poetry/issues/866.
-             (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/"
-                     "setup.py")
+             (substitute* "setup.py"
+               (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6
+               (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0"))
              #t)))))
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol)
        ("python-cachy" ,python-cachy)
        ("python-cleo" ,python-cleo)
-       ("python-glob2" ,python-glob2)
+       ("python-clikit" ,python-clikit)
        ("python-html5lib" ,python-html5lib)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-jsonschema" ,python-jsonschema)
-       ("python-msgpack" ,python-msgpack)
+       ("python-keyring" ,python-keyring)
+       ("python-pexpect" ,python-pexpect)
        ("python-pkginfo" ,python-pkginfo)
        ("python-pyparsing" ,python-pyparsing)
        ("python-pyrsistent" ,python-pyrsistent)
@@ -11273,7 +11275,7 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
        ("python-shellingham" ,python-shellingham)
        ("python-tomlkit" ,python-tomlkit)
        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://poetry.eustace.io/")
+    (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
 in Python.  It allows you to declare the libraries your project depends on and
-- 
2.25.2

[bug#39777] [PATCH V6 0/X] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

Argh ! Sorry Leo, but… someone updated (at least) one of Poetry's
dependency in the meantime and… Poetry doesn't support that version
(yet)!

I'm fixing it and sending an updated patch. Fortunately, it's only the
last patch of the stack that has to be updated!

Sorry for the noise!

-- 
Tanguy

bug#39777: [PATCH V6 0/X] gnu: poetry: Update to 1.0.5.

[Leo Famulari]

On Sat, Mar 21, 2020 at 03:26:09PM +0100, Tanguy Le Carrour wrote:
> Argh ! Sorry Leo, but… someone updated (at least) one of Poetry's
> dependency in the meantime and… Poetry doesn't support that version
> (yet)!
> 
> I'm fixing it and sending an updated patch. Fortunately, it's only the
> last patch of the stack that has to be updated!

Alright I pushed as 97b1366d49179f38a365bdfa383a8ccba779f8b8 with some
cosmetic changes to the commit messages, synopses, and descriptions, as
well as a fix for python-msgpack-transitional.

Thanks!

[bug#39777] [PATCH V6] gnu: poetry: Update to 1.0.5.

[Tanguy Le Carrour]

* gnu/packages/python-xyz.scm (poetry): Update to 1.0.5.
[propagated-inputs] Add python-clikit, add python-importlib-metadata,
add python-keyring, add python-pexpect, remove python-msgpack,
remove python-glob2.  [home-page] Update URL.
[arguments] Remove distutils patch, patch versions of keyring, pyrsistent
and importlib-metadata.
---
 gnu/packages/python-xyz.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f036b66aba..319bd83c43 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11237,34 +11237,37 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
 (define-public poetry
   (package
     (name "poetry")
-    (version "0.12.17")
-    ;; Poetry can only be built from source with poetry.
+    (version "1.0.5")
+    ;; Poetry can only be built from source with Poetry.
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "poetry" version))
        (sha256
         (base32
-         "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf"))))
+         "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f ;; Pypi does not have tests.
        #:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'patch-setup-py
            (lambda _
-             ;; Bug in poetry https://github.com/sdispater/poetry/issues/866.
-             (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/"
-                     "setup.py")
+             (substitute* "setup.py"
+               (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") ;; poetry won't update version as 21.0.0 relies on python > 3.6
+               (("pyrsistent>=0.14.2,<0.15.0") "pyrsistent>=0.14.2,<0.16.0")
+               (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0"))
              #t)))))
     (propagated-inputs
      `(("python-cachecontrol" ,python-cachecontrol)
        ("python-cachy" ,python-cachy)
        ("python-cleo" ,python-cleo)
-       ("python-glob2" ,python-glob2)
+       ("python-clikit" ,python-clikit)
        ("python-html5lib" ,python-html5lib)
+       ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8
        ("python-jsonschema" ,python-jsonschema)
-       ("python-msgpack" ,python-msgpack)
+       ("python-keyring" ,python-keyring)
+       ("python-pexpect" ,python-pexpect)
        ("python-pkginfo" ,python-pkginfo)
        ("python-pyparsing" ,python-pyparsing)
        ("python-pyrsistent" ,python-pyrsistent)
@@ -11273,7 +11276,7 @@ database, file, dict stores.  Cachy supports python versions 2.7+ and 3.2+.")
        ("python-shellingham" ,python-shellingham)
        ("python-tomlkit" ,python-tomlkit)
        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://poetry.eustace.io/")
+    (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
 in Python.  It allows you to declare the libraries your project depends on and
-- 
2.25.2