[bug#69978] [PATCH 0/4] Update and cleanup python-celery & friends.

[bug#69978] [PATCH 0/4] Update and cleanup python-celery & friends.

[Vinicius Monego]

Vinicius Monego (4):
  gnu: python-billiard: Update to 4.2.0.
  gnu: python-kombu: Update to 5.3.5.
  gnu: python-vine: Update to 5.1.0.
  gnu: python-celery: Update to 5.3.6.

 gnu/packages/python-xyz.scm | 100 ++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 55 deletions(-)


base-commit: bf530017f0e847ae895919b32ef37d79fa636a1e
-- 
2.39.2

[bug#69978] [PATCH 1/4] gnu: python-billiard: Update to 4.2.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-billiard): Update to 4.2.0.
[build-system]: Use pyproject-build-system.
[arguments]: Use G-Expressions. Do not delete test files.

Change-Id: I69ec62c0c28e9c7ff6ce65f722b250f50dbb33da
---
 gnu/packages/python-xyz.scm | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index aad89d251e..f9835edff4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18946,25 +18946,21 @@ (define-public python-kombu
 (define-public python-billiard
   (package
     (name "python-billiard")
-    (version "3.6.4.0")
+    (version "4.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "billiard" version))
        (sha256
-        (base32 "0ismj2p8c66ykpss94rs0bfra5agxxmljz8r3gaq79r8valfb799"))))
-    (build-system python-build-system)
+        (base32 "0b2svqx81511m0k2swjkybcx69f541dzd4rgfdxa2ni7rf232g4s"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'remove-win-files
-           (lambda _
-             (for-each delete-file-recursively
-                       ;; test_multiprocessing seem to be written in Python2.
-                       '("t/integration/tests/test_multiprocessing.py"
-                         "t/unit/test_win32.py"
-                         "billiard/popen_spawn_win32.py"
-                         "billiard/_win.py")))))))
+     (list #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'remove-win-files
+                          (lambda _
+                            (for-each delete-file-recursively
+                                      '("billiard/popen_spawn_win32.py"
+                                        "billiard/_win.py")))))))
     (native-inputs
      (list python-case python-psutil python-pytest))
     (home-page "https://github.com/celery/billiard")
-- 
2.39.2

[bug#69978] [PATCH 2/4] gnu: python-kombu: Update to 5.3.5.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-kombu): Update to 5.3.5.
[build-system]: Use pyproject-build-system.
[arguments]: Do not override the check phase. Ignore a file in #:test-flags.
[native-inputs]: Add python-botocore, python-tzdata. Remove python-pytz.
[propagated-inputs]: Add python-typing-extensions. Remove
python-cached-property.

Change-Id: I4b36effff8b17af388d56c90bf8983954adf4333
---
 gnu/packages/python-xyz.scm | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f9835edff4..3240aa2c40 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18909,30 +18909,27 @@ (define-public python-txamqp
 (define-public python-kombu
   (package
     (name "python-kombu")
-    (version "5.2.4")
+    (version "5.3.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "kombu" version))
        (sha256
-        (base32 "044ng79gj04668kf5fmy7fjkw8302xyapskkn65ym52zfbpf7kip"))))
-    (build-system python-build-system)
+        (base32 "14sbr1gkhiansnybdkk9qjk8l5sfrkjc64vddzf7175llvqp1r1h"))))
+    (build-system pyproject-build-system)
     (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              (when tests?
-                (invoke "pytest" "-vv"
-                        ;; The transport tests attempt to pass messages to
-                        ;; many different databases.
-                        "--ignore" "t/unit/transport")))))))
+     (list #:test-flags
+           ;; TODO: Package azure-identity (required for this file)
+           #~(list "--ignore" "t/unit/transport/test_azurestoragequeues.py")))
     (native-inputs
-     (list python-case python-pyro4 python-pytest-sugar
-           python-pytest python-pytz))
+     (list python-botocore
+           python-case
+           python-pyro4
+           python-pytest
+           python-pytest-sugar
+           python-tzdata))
     (propagated-inputs
-     (list python-amqp python-cached-property python-vine))
+     (list python-amqp python-typing-extensions python-vine))
     (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
-- 
2.39.2

[bug#69978] [PATCH 3/4] gnu: python-vine: Update to 5.1.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-vine): Update to 5.1.0.
[build-system]: Use pyproject-build-system.

Change-Id: I2621eb21deb516d16e9cc50ff9237aed1b6b46b8
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3240aa2c40..9021b9d9db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5786,14 +5786,14 @@ (define-public python-pyyaml-5
 (define-public python-vine
   (package
     (name "python-vine")
-    (version "5.0.0")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "vine" version))
        (sha256
-        (base32 "0zk3pm0g7s4qfn0gk28lfmsyplvisaxi6826cgpq5njkm4j1cfvx"))))
-    (build-system python-build-system)
+        (base32 "1q31krwxdvwawdn1kfqmpplix31d4jhs0qng26908hawsf0yjqlb"))))
+    (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest python-case))
     (home-page "https://github.com/celery/vine")
-- 
2.39.2

[bug#69978] [PATCH 4/4] gnu: python-celery: Update to 5.3.6.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery): Update to 5.3.6.
[build-system]: Use pyproject-build-system.
[arguments]: Replace pytz with tzdata in the relax-requirements phase. Do not
override the check phase, skip tests in #:test-flags instead.
[native-inputs]: Add python-pytest-click.
[propagated-inputs]: Add python-tzdata. Remove python-pytz.

Change-Id: I4cb6a1c6712d5b54f4d9a6731447e9459e8ff81a
---
 gnu/packages/python-xyz.scm | 43 +++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9021b9d9db..37f952e54e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18972,34 +18972,30 @@ (define-public python-billiard
 (define-public python-celery
   (package
     (name "python-celery")
-    (version "5.2.6")
+    (version "5.3.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "celery" version))
        (sha256
-        (base32 "109lcqarrbmh95sk1dm4yxayq1h3i27f4w23ndk64mqgyfnqqffi"))))
-    (build-system python-build-system)
+        (base32 "1fdacw13ij94s59l6lspl09iv6fc8h1p6399jz1h00kwfcfwf347"))))
+    (build-system pyproject-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'relax-requirements
-           (lambda _
-             (substitute* "requirements/default.txt"
-               (("pytz.*")
-                "pytz\n"))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "python" "-m" "pytest" "t"
-                       "--ignore" "t/integration" ;hangs tests
-                       ;; The MongoDB backend test appears to expect an older
-                       ;; version of MongoDB which provided its own bson
-                       ;; module, fails with " AttributeError: module 'bson'
-                       ;; has no attribute 'encode'".
-                       "--ignore" "t/unit/backends/test_mongodb.py"
-                       ;; AssertionErrors
-                       "-k" "not test_check_privileges_no_fchown ")))))))
+     (list
+      ;; The MongoDB backend test appears to expect an older
+      ;; version of MongoDB which provided its own bson
+      ;; module, fails with " AttributeError: module 'bson'
+      ;; has no attribute 'encode'".
+      #:test-flags #~(list "--ignore" "t/unit/backends/test_mongodb.py"
+                           ;; AssertionError.
+                           "-k" "not test_check_privileges_no_fchown")
+      #:phases #~(modify-phases %standard-phases
+                   ;; Celery requires tzdata >= 2022.7, we have 2022.1.
+                   (add-after 'unpack 'relax-requirements
+                     (lambda _
+                       (substitute* "requirements/default.txt"
+                         (("tzdata.*")
+                          "tzdata\n")))))))
     (native-inputs
      (list python-case
            python-dnspython
@@ -19009,6 +19005,7 @@ (define-public python-celery
            python-msgpack
            python-pytest                ;for pytest-subtests
            python-pytest-celery
+           python-pytest-click
            python-pytest-subtests
            python-pytest-timeout
            python-toml))
@@ -19019,7 +19016,7 @@ (define-public python-celery
            python-click-plugins
            python-click-repl
            python-kombu
-           python-pytz
+           python-tzdata
            python-vine))
     (home-page "https://celeryproject.org")
     (synopsis "Distributed Task Queue")
-- 
2.39.2

bug#69978: [PATCH 0/4] Update and cleanup python-celery & friends.

[Vinicius Monego]

Pushed after validating QA. Closing.

Em 24/03/2024 08:18, Vinicius Monego escreveu:
> Vinicius Monego (4):
>    gnu: python-billiard: Update to 4.2.0.
>    gnu: python-kombu: Update to 5.3.5.
>    gnu: python-vine: Update to 5.1.0.
>    gnu: python-celery: Update to 5.3.6.
>
>   gnu/packages/python-xyz.scm | 100 ++++++++++++++++--------------------
>   1 file changed, 45 insertions(+), 55 deletions(-)
>
>
> base-commit: bf530017f0e847ae895919b32ef37d79fa636a1e