[bug#33702] [PATCH 0/7] Fix python-kombu, update python-amqp, and add 5 new packages

[bug#33702] [PATCH 0/7] Fix python-kombu, update python-amqp, and add 5 new packages

[Christopher Baines]

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

python-kombu currently fails to build, to fix this, update the
package. This required updating python-amqp as well, and some additional
packages.

Christopher Baines (7):
  gnu: Add python-pytest-sugar.
  gnu: Add python-serpent.
  gnu: Add python-case.
  gnu: Add python-vine.
  gnu: Add python-pyro4.
  gnu: python-amqp: Update to 2.3.2.
  gnu: python-kombu: Update to 4.2.2.

 gnu/packages/check.scm  |  24 +++++++++
 gnu/packages/python.scm | 113 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 132 insertions(+), 5 deletions(-)

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

[bug#33702] [PATCH 1/7] gnu: Add python-pytest-sugar.

[Christopher Baines]

This is required to update python-amqp and python-kombu.

* gnu/packages/check.scm (check): New variable.
---
 gnu/packages/check.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 937e4e094c..5bf849d666 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1414,6 +1414,30 @@ normally the case.")
 (define-public python2-pytest-subtesthack
   (package-with-python2 python-pytest-subtesthack))
 
+(define-public python-pytest-sugar
+  (package
+    (name "python-pytest-sugar")
+    (version "0.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-sugar" version))
+       (sha256
+        (base32
+         "1asq7yc4g8bx2sn7yy974mhc9ywvaihasjab4inkirdwn9s7mn7w"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-packaging" ,python-packaging)
+       ("python-pytest" ,python-pytest)
+       ("python-termcolor" ,python-termcolor)))
+    (home-page "https://pivotfinland.com/pytest-sugar/")
+    (synopsis "Plugin for pytest that changes the default look and feel")
+    (description
+     "@code{pytest-sugar} is a plugin for py.test that changes the default
+look and feel of py.test, using a progress bar and showing failures and errors
+instantly.")
+    (license license:bsd-3)))
+
 (define-public python-hypothesis
   (package
     (name "python-hypothesis")
-- 
2.18.0

[bug#33702] [PATCH 2/7] gnu: Add python-serpent.

[Christopher Baines]

This is required for python-pyro4, which is needed to update python-amqp and
python-kombu.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 23b980ec32..e973fd8a5d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -908,6 +908,29 @@ version identifier.")
 (define-public python2-semantic-version
   (package-with-python2 python-semantic-version))
 
+(define-public python-serpent
+  (package
+    (name "python-serpent")
+    (version "1.27")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "serpent" version))
+       (sha256
+        (base32
+         "04p9dsrm5pv8vhk3flvih55kgvlzpi38hlaykdiakddmgwqw93bg"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/irmen/Serpent")
+    (synopsis "Serializer for literal Python expressions")
+    (description
+     "Serpent provides ast.literal_eval() compatible object tree
+serialization.  It serializes an object tree into bytes (utf-8 encoded string)
+that can be decoded and then passed as-is to ast.literal_eval() to rebuild it
+as the original object tree.  As such it is safe to send serpent data to other
+machines over the network for instance (because only safe literals are
+encoded).")
+    (license license:expat)))
+
 (define-public python-setuptools
   (package
     (name "python-setuptools")
-- 
2.18.0

[bug#33702] [PATCH 3/7] gnu: Add python-case.

[Christopher Baines]

This is required to update python-amqp and python-kombu, as well as adding
python-vine.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e973fd8a5d..a61be664de 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1071,6 +1071,32 @@ for additional processing.")
 (define-public python2-capturer
   (package-with-python2 python-capturer))
 
+(define-public python-case
+  (package
+    (name "python-case")
+    (version "1.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "case" version))
+       (sha256
+        (base32
+         "1cagg06vfph864s6l5jb0zqliwxh647bki8j6lf4a4qrv40jnhs8"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-mock" ,python-mock)
+       ("python-nose" ,python-nose)
+       ("python-six" ,python-six)
+       ("python-unittest2" ,python-unittest2)))
+    (native-inputs
+     `(("python-coverage" ,python-coverage)))
+    (home-page "https://github.com/celery/case")
+    (synopsis "Unittest utilities and convenience methods")
+    (description
+     "The @code{case} package provides utilities on top of unittest, including
+some helpful Python 2 compatibility convenience methods.")
+    (license license:bsd-3)))
+
 (define-public python-verboselogs
   (package
     (name "python-verboselogs")
-- 
2.18.0

[bug#33702] [PATCH 4/7] gnu: Add python-vine.

[Christopher Baines]

This is needed to update python-amqp to 2.3.2.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a61be664de..25931974ae 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2317,6 +2317,30 @@ object.")
 (define-public python2-pyyaml
   (package-with-python2 python-pyyaml))
 
+(define-public python-vine
+  (package
+    (name "python-vine")
+    (version "1.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "vine" version))
+       (sha256
+        (base32
+         "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-case" ,python-case)))
+    (home-page "https://github.com/celery/vine")
+    (synopsis "Promises for Python")
+    (description
+     "@code{vine} provides a special implementation of promises in that it can
+be used both for \"promise of a value\" and lazy evaluation.  The biggest
+upside for this is that everything in a promise can also be a promise,
+e.g. filters, callbacks and errbacks can all be promises.")
+    (license license:bsd-3)))
+
 (define-public python-virtualenv
   (package
     (name "python-virtualenv")
-- 
2.18.0

[bug#33702] [PATCH 5/7] gnu: Add python-pyro4.

[Christopher Baines]

This is needed to update python-kombu to 4.2.2

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 25931974ae..7682c04e77 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13336,6 +13336,28 @@ such as figshare or Zenodo.")
 (define-public python2-semver
   (package-with-python2 python-semver))
 
+(define-public python-pyro4
+  (package
+    (name "python-pyro4")
+    (version "4.74")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Pyro4" version))
+       (sha256
+        (base32
+         "0pzp7c6q3vvkxq0wy9lr6wd5wky40sajz69g697i5rb2q497pvc9"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-serpent" ,python-serpent)))
+    (home-page "https://pyro4.readthedocs.io")
+    (synopsis "Distributed object middleware for Python")
+    (description
+     "Pyro enables you to build applications in which objects can talk to each
+other over the network.  You can just use normal Python method calls to call
+objects on other machines, also known as remote procedure calls (RPC).")
+    (license license:expat)))
+
 (define-public python2-pyro
   (package
     (name "python2-pyro")
-- 
2.18.0

[bug#33702] [PATCH 6/7] gnu: python-amqp: Update to 2.3.2.

[Christopher Baines]

This is needed to update python-kombu to 4.2.2.

* gnu/packages/python.scm (python-amqp): Update to 2.3.2.
---
 gnu/packages/python.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7682c04e77..5ff91c4579 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8269,18 +8269,22 @@ and provides a uniform API regardless of which JSON implementation is used.")
 (define-public python-amqp
   (package
     (name "python-amqp")
-    (version "1.4.9")
+    (version "2.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "amqp" version))
        (sha256
         (base32
-         "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"))))
+         "1sv600dgqwpimr6i1g59y9hpn50mc236gdqkr7zin13kvlpx0g87"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-nose" ,python-nose)
+       ("python-case" ,python-case)
+       ("python-pytest-sugar" ,python-pytest-sugar)
        ("python-mock" ,python-mock)))
+    (propagated-inputs
+     `(("python-vine" ,python-vine)))
     (home-page "https://github.com/celery/py-amqp")
     (synopsis
      "Low-level AMQP client for Python (fork of amqplib)")
-- 
2.18.0

[bug#33702] [PATCH 7/7] gnu: python-kombu: Update to 4.2.2.

[Christopher Baines]

This fixes the build, that probably broke with a Python update.

* gnu/packages/python.scm (python-kombu): Update to 4.2.2..
---
 gnu/packages/python.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5ff91c4579..52e23a19fa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8338,23 +8338,27 @@ applications.")
 (define-public python-kombu
   (package
     (name "python-kombu")
-    (version "3.0.37")
+    (version "4.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "kombu" version))
        (sha256
         (base32
-         "0l16chb314gpq2v7fh94a22c30lcv6w3ylmhsa60bldlcq6a0r70"))))
+         "15k8f7mzqr049sg9vi48m19vjykviafk3f0p5xzgw9by0x0kyxjj"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-mock" ,python-mock)
+       ("python-case" ,python-case)
+       ("python-pyro4" ,python-pyro4)
+       ("python-pytest-sugar" ,python-pytest-sugar)
+       ("python-pytz" ,python-pytz)
        ("python-nose" ,python-nose)))
     (propagated-inputs
      `(("python-anyjson" ,python-anyjson)
        ("python-amqp" ,python-amqp)
        ("python-redis" ,python-redis)))
-    (home-page "http://kombu.readthedocs.org")
+    (home-page "https://kombu.readthedocs.io")
     (synopsis "Message passing library for Python")
     (description "The aim of Kombu is to make messaging in Python as easy as
 possible by providing an idiomatic high-level interface for the AMQ protocol,
-- 
2.18.0

[bug#33702] [PATCH 1/2] gnu: python-billiard: Update to 3.5.0.5.

[Christopher Baines]

This is to enable updating python-celery.

* gnu/packages/python.scm (python-billiard): Update to 3.5.0.5.
[native-inputs]: Remove python-nose, add python-case and python-pytest.
---
 gnu/packages/python.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 52e23a19fa..709916d42c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8384,17 +8384,18 @@ RabbitMQ messaging server is the most popular implementation.")
 (define-public python-billiard
   (package
     (name "python-billiard")
-    (version "3.3.0.23")
+    (version "3.5.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "billiard" version))
        (sha256
         (base32
-         "02wxsc6bhqvzh8j6w758kvgqbnj14l796mvmrcms8fgfamd2lak9"))))
+         "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2"))))
     (build-system python-build-system)
     (native-inputs
-     `(("python-nose" ,python-nose)))
+     `(("python-case" ,python-case)
+       ("python-pytest" ,python-pytest)))
     (home-page "https://github.com/celery/billiard")
     (synopsis
      "Python multiprocessing fork with improvements and bugfixes")
-- 
2.18.0

[bug#33702] [PATCH 2/2] gnu: python-celery: Update to 4.2.1.

[Christopher Baines]

This is an attempt to get the package building after the update to Python
3.7. I'm not sure this totally works, as the tests detect an incompatibility
with Python 3.7 due to use of "async". But with the tests disabled, you can at
least import the celery module, which is a start.

* gnu/packages/python.scm (python-celery): Update to 4.2.1.
[arguments]: Switch to py.test, from nose, disable the tests and loosen the
requirements on pytest.
[native-inputs]: Remove python-nose, add python-pytest and python-case.
[home-page]: Change from HTTP to HTTPS.
---
 gnu/packages/python.scm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 709916d42c..1e0af3ff6b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8419,31 +8419,35 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
 (define-public python-celery
   (package
     (name "python-celery")
-    (version "3.1.24")
+    (version "4.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "celery" version))
        (sha256
         (base32
-         "0yh2prhdnx2dgkb67a5drj12hh2zvzx5f611p7mqqg01ydghif4r"))))
+         "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
+     '(;; TODO The tests fail with Python 3.7
+       ;; https://github.com/celery/celery/issues/4849
+       #:tests? #f
+       #:phases
        (modify-phases %standard-phases
-         ;; These tests break with Python 3.5:
-         ;; https://github.com/celery/celery/issues/2897#issuecomment-253066295
-         (replace 'check
+         (add-after 'unpack 'patch-requirements
            (lambda _
-             (zero?
-               (system* "nosetests" "--exclude=^test_safe_to_remove.*")))))))
+             (substitute* "requirements/test.txt"
+               (("pytest>=3\\.0,<3\\.3")
+                "pytest>=3.0"))
+             #t)))))
     (native-inputs
-     `(("python-nose" ,python-nose)))
+     `(("python-case" ,python-case)
+       ("python-pytest" ,python-pytest)))
     (propagated-inputs
      `(("python-pytz" ,python-pytz)
        ("python-billiard" ,python-billiard)
        ("python-kombu" ,python-kombu)))
-    (home-page "http://celeryproject.org")
+    (home-page "https://celeryproject.org")
     (synopsis "Distributed Task Queue")
     (description "Celery is an asynchronous task queue/job queue based on
 distributed message passing.  It is focused on real-time operation, but
-- 
2.18.0

[bug#33702] [PATCH 0/7] Fix python-kombu, update python-amqp, and add 5 new packages

[Leo Famulari]

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

On Tue, Dec 11, 2018 at 07:55:08AM +0100, Christopher Baines wrote:
> python-kombu currently fails to build, to fix this, update the
> package. This required updating python-amqp as well, and some additional
> packages.
> 
> Christopher Baines (7):
>   gnu: Add python-pytest-sugar.
>   gnu: Add python-serpent.
>   gnu: Add python-case.
>   gnu: Add python-vine.
>   gnu: Add python-pyro4.
>   gnu: python-amqp: Update to 2.3.2.
>   gnu: python-kombu: Update to 4.2.2.

LGTM!

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

bug#33702: [PATCH 0/7] Fix python-kombu, update python-amqp, and add 5 new packages

[Christopher Baines]

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


Leo Famulari <leo@famulari.name> writes:

> On Tue, Dec 11, 2018 at 07:55:08AM +0100, Christopher Baines wrote:
>> python-kombu currently fails to build, to fix this, update the
>> package. This required updating python-amqp as well, and some additional
>> packages.
>>
>> Christopher Baines (7):
>>   gnu: Add python-pytest-sugar.
>>   gnu: Add python-serpent.
>>   gnu: Add python-case.
>>   gnu: Add python-vine.
>>   gnu: Add python-pyro4.
>>   gnu: python-amqp: Update to 2.3.2.
>>   gnu: python-kombu: Update to 4.2.2.
>
> LGTM!

Great :) I slightly tweaked amqp and kombu to remove python-nose, as I
realised this was an unnecessry input when updating billiard and celery.

I've now pushed these patches, thanks for taking a look.

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