[bug#50018] [PATCH 00/19] Update Celery to version 5.

[bug#50018] [PATCH 00/19] Update Celery to version 5.

[Vinicius Monego]

Vinicius Monego (19):
  gnu: Add python-click-repl.
  gnu: Add python-click-didyoumean.
  gnu: Add python-pytest-subtests.
  gnu: python-aws-sam-translator: Update to 1.38.0.
  gnu: python-aws-sam-translator: Change source for tests.
  gnu: python-cfn-lint: Update to 0.53.0.
  gnu: python-cfn-lint: Respect #:tests?.
  gnu: python-moto: Update to 2.2.2.
  gnu: python-moto: Respect #:tests?.
  gnu: python-vine: Update to 5.0.0.
  gnu: Add python-pytest-rerunfailures.
  gnu: python-amqp: Update to 5.0.6.
  gnu: python-kombu: Update to 5.1.0.
  gnu: Add python-pytest-celery.
  gnu: python-celery: Update to 5.1.2.
  gnu: python-celery: Enable tests.
  gnu: Remove python2-celery.
  gnu: Remove python2-kombu.
  gnu: Remove python2-amqp.

 gnu/packages/python-check.scm |  76 ++++++++++
 gnu/packages/python-web.scm   | 100 +++++++-----
 gnu/packages/python-xyz.scm   | 276 +++++++++++++++++++++++-----------
 3 files changed, 323 insertions(+), 129 deletions(-)

-- 
2.30.2

[bug#50018] [PATCH 01/19] gnu: Add python-click-repl.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-click-repl): New variable.
---
 gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 295d158bd3..7f2863e5fb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4067,6 +4067,40 @@ via commands such as @command{rst2man}, as well as supporting Python code.")
 format.")
     (license license:unlicense)))
 
+(define-public python-click-repl
+  (package
+    (name "python-click-repl")
+    (version "0.2.0")
+    (source
+     (origin
+       ;; There are no tests in the PyPI tarball.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/click-contrib/click-repl")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16ybsnwlj2jlqcfxflky8jz7i3nhrd3f6mvkpgs95618l8lx994i"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (propagated-inputs
+     `(("python-click" ,python-click)
+       ("python-prompt-toolkit" ,python-prompt-toolkit)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/untitaker/click-repl")
+    (synopsis "REPL plugin for Click")
+    (description "This package provides a REPL plugin for Click.")
+    (license license:expat)))
+
 (define-public python-doc8
   (package
     (name "python-doc8")
-- 
2.30.2

[bug#50018] [PATCH 02/19] gnu: Add python-click-didyoumean.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-click-didyoumean): New variable.
---
 gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7f2863e5fb..af415e2666 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6888,6 +6888,40 @@ in an image.  It then applies the colors system-wide and on-the-fly in all of
 your favourite programs.")
     (license license:expat)))
 
+(define-public python-click-didyoumean
+  (package
+    (name "python-click-didyoumean")
+    (version "0.0.3")
+    (source
+     (origin
+       ;; There are no tests in the PyPI tarball.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/click-contrib/click-didyoumean")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qb3csx27vby8w5534l4la08sq2nv7wb2fzghv1glrxnxk1a73vg"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; FIXME: tests fail because of single/double quote mismatch
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (propagated-inputs
+     `(("python-click" ,python-click)))
+    (home-page "https://github.com/timofurrer/click-didyoumean")
+    (synopsis "Git-like did-you-mean feature in Click")
+    (description
+     "This plugin enables git-like did-you-mean feature in Click.")
+    (license license:expat)))
+
 (define-public python-pywinrm
   (package
     (name "python-pywinrm")
-- 
2.30.2

[bug#50018] [PATCH 03/19] gnu: Add python-pytest-subtests.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 038ca177af..0eef7ba8e5 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -576,6 +576,34 @@ in Pytest.")
  settings.")
     (license license:expat)))
 
+(define-public python-pytest-subtests
+  (package
+    (name "python-pytest-subtests")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-subtests" version))
+       (sha256
+        (base32 "087i03nmkmfnrpc7mmizvr40ijnjw4lfxc22rnk8jk6s1szy9lav"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-setuptools-scm" ,python-setuptools-scm)))
+    (home-page "https://github.com/pytest-dev/pytest-subtests")
+    (synopsis "Unittest subTest() support and subtests fixture")
+    (description "This Pytest plugin provides unittest @code{subTest()}
+support and @code{subtests} fixture.")
+    (license license:expat)))
+
 (define-public python-pytest-vcr
   ;; This commit fixes integration with pytest-5
   (let ((commit "4d6c7b3e379a6a7cba0b8f9d20b704dc976e9f05")
-- 
2.30.2

[bug#50018] [PATCH 04/19] gnu: python-aws-sam-translator: Update to 1.38.0.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.38.0.
---
 gnu/packages/python-web.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5df134ddff..787300e1f8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -363,13 +363,13 @@ WSGI.  This package includes libraries for implementing ASGI servers.")
 (define-public python-aws-sam-translator
   (package
     (name "python-aws-sam-translator")
-    (version "1.36.0")
+    (version "1.38.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "aws-sam-translator" version))
               (sha256
                (base32
-                "115mcbb4r205c1hln199llqrvvbijfqz075rwx991l99jc6rj6zs"))))
+                "1djwlsjpbh13m4biglimrm9lq7hmla0k29giay7k3cjsrylxvjhf"))))
     (build-system python-build-system)
     (arguments
      `(;; XXX: Tests are not distributed with the PyPI archive, and would
@@ -387,6 +387,7 @@ WSGI.  This package includes libraries for implementing ASGI servers.")
     (propagated-inputs
      `(("python-boto3" ,python-boto3)
        ("python-jsonschema" ,python-jsonschema)
+       ("python-pyrsistent" ,python-pyrsistent)
        ("python-six" ,python-six)))
     (home-page "https://github.com/awslabs/serverless-application-model")
     (synopsis "Transform AWS SAM templates into AWS CloudFormation templates")
-- 
2.30.2

[bug#50018] [PATCH 05/19] gnu: python-aws-sam-translator: Change source for tests.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-aws-sam-translator)[source]: Fetch from
GitHub. Make some cosmetic changes.
[arguments]: Change explanation on why tests are disabled. Make some cosmetic
changes.
[native-inputs]: Add python-black, python-click, python-coverage,
python-dateparser, python-docopt, python-flake8, python-mock,
python-parameterized, python-pathlib2, python-pylint, python-pytest,
python-pytest-cov, python-pyyaml, python-requests.
---
 gnu/packages/python-web.scm | 57 +++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 787300e1f8..041fb2d7b7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -364,26 +364,47 @@ WSGI.  This package includes libraries for implementing ASGI servers.")
   (package
     (name "python-aws-sam-translator")
     (version "1.38.0")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "aws-sam-translator" version))
-              (sha256
-               (base32
-                "1djwlsjpbh13m4biglimrm9lq7hmla0k29giay7k3cjsrylxvjhf"))))
+    (source
+     (origin
+       ;; PyPI tarball does not include tests.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aws/serverless-application-model")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nn9jfqz13kzmxm0r9vy24p8sqxv3mrm5d3lx7ah6rc581q8nv1k"))))
     (build-system python-build-system)
     (arguments
-     `(;; XXX: Tests are not distributed with the PyPI archive, and would
-       ;; introduce a circular dependency on python-cfn-lint.
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'loosen-requirements
-                    (lambda _
-                      ;; The package needlessly specifies exact versions
-                      ;; of dependencies, when it works fine with others.
-                      (substitute* "requirements/base.txt"
-                        (("(.*)(~=[0-9\\.]+)" all package version)
-                         package))
-                      #t)))))
+     ;; 25 test failures divided in the following two errors:
+     ;; 'botocore.exceptions.NoRegionError: You must specify a region.'
+     ;; AttributeError: 'TestDeploymentPreferenceCollection' object has
+     ;; no attribute 'function_logical_id'.
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'loosen-requirements
+           (lambda _
+             ;; The package needlessly specifies exact versions
+             ;; of dependencies, when it works fine with others.
+             (substitute* "requirements/base.txt"
+               (("(.*)(~=[0-9\\.]+)" all package version)
+                package)))))))
+    (native-inputs
+     `(("python-black" ,python-black)
+       ("python-click" ,python-click)
+       ("python-coverage" ,python-coverage)
+       ("python-dateparser" ,python-dateparser)
+       ("python-docopt" ,python-docopt)
+       ("python-flake8" ,python-flake8)
+       ("python-mock" ,python-mock)
+       ("python-parameterized" ,python-parameterized)
+       ("python-pathlib2" ,python-pathlib2)
+       ("python-pylint" ,python-pylint)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-requests" ,python-requests)))
     (propagated-inputs
      `(("python-boto3" ,python-boto3)
        ("python-jsonschema" ,python-jsonschema)
-- 
2.30.2

[bug#50018] [PATCH 06/19] gnu: python-cfn-lint: Update to 0.53.0.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-cfn-lint): Update to 0.53.0.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 041fb2d7b7..e1da025cfb 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -488,7 +488,7 @@ emit information from within their applications to the AWS X-Ray service.")
 (define-public python-cfn-lint
   (package
     (name "python-cfn-lint")
-    (version "0.51.0")
+    (version "0.53.0")
     (home-page "https://github.com/aws-cloudformation/cfn-python-lint")
     (source (origin
               (method git-fetch)
@@ -498,7 +498,7 @@ emit information from within their applications to the AWS X-Ray service.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1027s243sik25c6sqw6gla7k7vl3jdicrik5zdsa8pafxh2baja4"))))
+                "1njcrwanq0py0qpz875bg05jyrs2cvpcc570xxb8rjh139n1nxsh"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.30.2

[bug#50018] [PATCH 07/19] gnu: python-cfn-lint: Respect #:tests?.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-cfn-lint)[arguments]: Make some cosmetic
changes. Respect #:tests? in the custom 'check phase.
---
 gnu/packages/python-web.scm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e1da025cfb..9572bed39c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -501,23 +501,25 @@ emit information from within their applications to the AWS X-Ray service.")
                 "1njcrwanq0py0qpz875bg05jyrs2cvpcc570xxb8rjh139n1nxsh"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        ;; Remove test for the documentation update scripts
-                        ;; to avoid a dependency on 'git'.
-                        (delete-file
-                         "test/unit/module/maintenance/test_update_documentation.py")
-                        (delete-file
-                         "test/unit/module/maintenance/test_update_resource_specs.py")
-                        (setenv "PYTHONPATH"
-                                (string-append "./build/lib:"
-                                               (getenv "PYTHONPATH")))
-                        (setenv "PATH" (string-append out "/bin:"
-                                                      (getenv "PATH")))
-                        (invoke "python" "-m" "unittest" "discover"
-                                "-s" "test")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key outputs tests? #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 ;; Remove test for the documentation update scripts
+                 ;; to avoid a dependency on 'git'.
+                 (delete-file
+                  "test/unit/module/maintenance/test_update_documentation.py")
+                 (delete-file
+                  "test/unit/module/maintenance/test_update_resource_specs.py")
+                 (setenv "PYTHONPATH"
+                         (string-append "./build/lib:"
+                                        (getenv "PYTHONPATH")))
+                 (setenv "PATH" (string-append out "/bin:"
+                                               (getenv "PATH")))
+                 (invoke "python" "-m" "unittest" "discover"
+                         "-s" "test"))))))))
     (native-inputs
      `(("python-pydot" ,python-pydot)
        ("python-mock" ,python-mock)))
-- 
2.30.2

[bug#50018] [PATCH 08/19] gnu: python-moto: Update to 2.2.2.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-moto): Update to 2.2.2.
[arguments]: Make some cosmetic changes. Skip more tests. Don't return #t on
phases.
---
 gnu/packages/python-xyz.scm | 68 +++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index af415e2666..57b4e7fa58 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12474,34 +12474,60 @@ text.")
 (define-public python-moto
   (package
     (name "python-moto")
-    ;; XXX: Use a pre-release for compatibility with latest botocore & friends.
-    (version "1.3.16.dev134")
+    (version "2.2.2")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "moto" version))
               (sha256
                (base32
-                "1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
+                "09dpjxp7xb5y1haj5aq6f5lcfzjd0121xqv75zyk6j6bkcbskddh"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'patch-hardcoded-executable-names
-                    (lambda _
-                      (substitute* "moto/batch/models.py"
-                        (("/bin/sh")
-                         (which "sh")))
-                      (substitute* (find-files "tests" "\\.py$")
-                        (("#!/bin/bash")
-                         (string-append "#!" (which "bash"))))
-                      #t))
-                  (replace 'check
-                    (lambda _
-                      (setenv "PYTHONPATH" (string-append "./build/lib:"
-                                                          (getenv "PYTHONPATH")))
-                      (invoke "pytest" "-vv" "-m" "not network"
-                              ;; These tests require Docker.
-                              "-k" "not test_terminate_job \
-and not test_invoke_function_from_sqs_exception"))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-hardcoded-executable-names
+           (lambda _
+             (substitute* "moto/batch/models.py"
+               (("/bin/sh")
+                (which "sh")))
+             (substitute* (find-files "tests" "\\.py$")
+               (("#!/bin/bash")
+                (string-append "#!" (which "bash"))))))
+         (replace 'check
+           (lambda _
+             (setenv "PYTHONPATH" (string-append "./build/lib:"
+                                                 (getenv "PYTHONPATH")))
+             (invoke "pytest" "-vv" "-m" "not network" "-k"
+                     ;; These tests require Docker.
+                     (string-append "not test_terminate_job"
+                                    " and not test_invoke_function_from_sqs_exception"
+                                    " and not test_rotate_secret_lambda_invocations"
+                                    ;; No indication of why this one fails.
+                                    " and not test_container_overrides"
+                                    " and not test_dependencies"
+                                    ;; Exception from python-botocore 1.19.22.
+                                    ;; XXX: May pass after update.
+                                    " and not test_object_headers"
+                                    " and not test_delete_connection_not_present"
+                                    " and not test_delete_connection_success"
+                                    " and not test_describe_connection_not_present"
+                                    " and not test_describe_connection_success"
+                                    " and not test_delete_api_destination"
+                                    " and not test_create_and_list_api_destinations"
+                                    " and not test_delete_connection"
+                                    " and not test_create_and_describe_connection"
+                                    " and not test_create_and_list_connections"
+                                    " and not test_create_file_system_az_name_given_backup_default"
+                                    " and not test_create_file_system_aws_sample_2"
+                                    " and not test_describe_file_systems_aws_create_sample_2"
+                                    " and not test_create_file_system_aws_sample_1"
+                                    " and not test_create_image_with_tag_specification"
+                                    " and not test_get_group_configuration"
+                                    " and not test_create_and_update_api_destination"
+                                    ;; Exception from python-sure 1.4.11.
+                                    ;; XXX: May pass after update.
+                                    " and not test_encryption"
+                                    " and not test_create_transit_gateway")))))))
     (native-inputs
      `(("python-flask" ,python-flask)
        ("python-flask-cors" ,python-flask-cors)
-- 
2.30.2

[bug#50018] [PATCH 09/19] gnu: python-moto: Respect #:tests?.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-moto)[source]: Make some cosmetic
changes.
[arguments]: Respect #:tests? in the custom 'check phase.
---
 gnu/packages/python-xyz.scm | 81 +++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 57b4e7fa58..0b358ceca3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12475,12 +12475,12 @@ text.")
   (package
     (name "python-moto")
     (version "2.2.2")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "moto" version))
-              (sha256
-               (base32
-                "09dpjxp7xb5y1haj5aq6f5lcfzjd0121xqv75zyk6j6bkcbskddh"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "moto" version))
+       (sha256
+        (base32 "09dpjxp7xb5y1haj5aq6f5lcfzjd0121xqv75zyk6j6bkcbskddh"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -12494,40 +12494,41 @@ text.")
                (("#!/bin/bash")
                 (string-append "#!" (which "bash"))))))
          (replace 'check
-           (lambda _
-             (setenv "PYTHONPATH" (string-append "./build/lib:"
-                                                 (getenv "PYTHONPATH")))
-             (invoke "pytest" "-vv" "-m" "not network" "-k"
-                     ;; These tests require Docker.
-                     (string-append "not test_terminate_job"
-                                    " and not test_invoke_function_from_sqs_exception"
-                                    " and not test_rotate_secret_lambda_invocations"
-                                    ;; No indication of why this one fails.
-                                    " and not test_container_overrides"
-                                    " and not test_dependencies"
-                                    ;; Exception from python-botocore 1.19.22.
-                                    ;; XXX: May pass after update.
-                                    " and not test_object_headers"
-                                    " and not test_delete_connection_not_present"
-                                    " and not test_delete_connection_success"
-                                    " and not test_describe_connection_not_present"
-                                    " and not test_describe_connection_success"
-                                    " and not test_delete_api_destination"
-                                    " and not test_create_and_list_api_destinations"
-                                    " and not test_delete_connection"
-                                    " and not test_create_and_describe_connection"
-                                    " and not test_create_and_list_connections"
-                                    " and not test_create_file_system_az_name_given_backup_default"
-                                    " and not test_create_file_system_aws_sample_2"
-                                    " and not test_describe_file_systems_aws_create_sample_2"
-                                    " and not test_create_file_system_aws_sample_1"
-                                    " and not test_create_image_with_tag_specification"
-                                    " and not test_get_group_configuration"
-                                    " and not test_create_and_update_api_destination"
-                                    ;; Exception from python-sure 1.4.11.
-                                    ;; XXX: May pass after update.
-                                    " and not test_encryption"
-                                    " and not test_create_transit_gateway")))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (setenv "PYTHONPATH" (string-append "./build/lib:"
+                                                   (getenv "PYTHONPATH")))
+               (invoke "pytest" "-vv" "-m" "not network" "-k"
+                       ;; These tests require Docker.
+                       (string-append "not test_terminate_job"
+                                      " and not test_invoke_function_from_sqs_exception"
+                                      " and not test_rotate_secret_lambda_invocations"
+                                      ;; No indication of why this one fails.
+                                      " and not test_container_overrides"
+                                      " and not test_dependencies"
+                                      ;; Exception from python-botocore 1.19.22.
+                                      ;; XXX: May pass after update.
+                                      " and not test_object_headers"
+                                      " and not test_delete_connection_not_present"
+                                      " and not test_delete_connection_success"
+                                      " and not test_describe_connection_not_present"
+                                      " and not test_describe_connection_success"
+                                      " and not test_delete_api_destination"
+                                      " and not test_create_and_list_api_destinations"
+                                      " and not test_delete_connection"
+                                      " and not test_create_and_describe_connection"
+                                      " and not test_create_and_list_connections"
+                                      " and not test_create_file_system_az_name_given_backup_default"
+                                      " and not test_create_file_system_aws_sample_2"
+                                      " and not test_describe_file_systems_aws_create_sample_2"
+                                      " and not test_create_file_system_aws_sample_1"
+                                      " and not test_create_image_with_tag_specification"
+                                      " and not test_get_group_configuration"
+                                      " and not test_create_and_update_api_destination"
+                                      ;; Exception from python-sure 1.4.11.
+                                      ;; XXX: May pass after update.
+                                      " and not test_encryption"
+                                      " and not test_create_transit_gateway"))))))))
     (native-inputs
      `(("python-flask" ,python-flask)
        ("python-flask-cors" ,python-flask-cors)
-- 
2.30.2

[bug#50018] [PATCH 10/19] gnu: python-vine: Update to 5.0.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-vine): Update to 5.0.0.
[source]: Make some cosmetic changes.
---
 gnu/packages/python-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0b358ceca3..69a0c369db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3693,14 +3693,13 @@ provides Python-specific tags that represent an arbitrary Python object.")
 (define-public python-vine
   (package
     (name "python-vine")
-    (version "1.1.4")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "vine" version))
        (sha256
-        (base32
-         "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj"))))
+        (base32 "0zk3pm0g7s4qfn0gk28lfmsyplvisaxi6826cgpq5njkm4j1cfvx"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-pytest" ,python-pytest)
-- 
2.30.2

[bug#50018] [PATCH 11/19] gnu: Add python-pytest-rerunfailures.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 0eef7ba8e5..148dfd5fad 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1037,6 +1037,34 @@ service processes for your tests with pytest.")
 new fixtures, new methods and new comparison objects.")
     (license license:expat)))
 
+(define-public python-pytest-rerunfailures
+  (package
+    (name "python-pytest-rerunfailures")
+    (version "10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-rerunfailures" version))
+       (sha256
+        (base32 "0ws2hbgh00nd6xchyi9ymyxfpg5jpxsy5mxdz4nxvriyw5nw05vn"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest"
+                       "test_pytest_rerunfailures.py")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (home-page "https://github.com/pytest-dev/pytest-rerunfailures")
+    (synopsis "Pytest plugin to re-run tests to eliminate flaky failures")
+    (description "This package provides a Pytest plugin to re-run tests to
+eliminate flaky failures.")
+    (license license:mpl2.0)))
+
 (define-public python-pytest-aiohttp
   (package
     (name "python-pytest-aiohttp")
-- 
2.30.2

[bug#50018] [PATCH 12/19] gnu: python-amqp: Update to 5.0.6.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-amqp): Update to 5.0.6.
[source]: Make some cosmetic changes.
---
 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 69a0c369db..7c4232cbd5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13177,17 +13177,24 @@ and provides a uniform API regardless of which JSON implementation is used.")
 (define-public python-amqp
   (package
     (name "python-amqp")
-    (version "2.3.2")
+    (version "5.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "amqp" version))
        (sha256
-        (base32
-         "1sv600dgqwpimr6i1g59y9hpn50mc236gdqkr7zin13kvlpx0g87"))))
+        (base32 "1hk8jli0s8dinxwihskzbwqlrancsgfxh1hjpzw32k5kyaa6xq83"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-rabbitmq-tests
+           (lambda _
+             ;; All tests in this file require RabbitMQ.
+             (delete-file-recursively "t/integration/test_rmq.py"))))))
     (native-inputs
      `(("python-case" ,python-case)
+       ("python-pytest-rerunfailures" ,python-pytest-rerunfailures)
        ("python-pytest-sugar" ,python-pytest-sugar)
        ("python-mock" ,python-mock)))
     (propagated-inputs
-- 
2.30.2

[bug#50018] [PATCH 13/19] gnu: python-kombu: Update to 5.1.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-kombu): Update to 5.1.0.
[source]: Make some cosmetic changes.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7c4232cbd5..f14f40e55e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13251,25 +13251,31 @@ applications.")
 (define-public python-kombu
   (package
     (name "python-kombu")
-    (version "4.2.2")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "kombu" version))
        (sha256
-        (base32
-         "15k8f7mzqr049sg9vi48m19vjykviafk3f0p5xzgw9by0x0kyxjj"))))
+        (base32 "0bap3b244h9jhaswyqjg7sgfwlyk9qk3gdn9rlwnjvv0yjcisj01"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-transport-tests
+           (lambda _
+             ;; This tests message passing to many different databases.
+             (delete-file-recursively "t/unit/transport"))))))
     (native-inputs
-     `(("python-mock" ,python-mock)
-       ("python-case" ,python-case)
+     `(("python-case" ,python-case)
+       ("python-mock" ,python-mock)
        ("python-pyro4" ,python-pyro4)
        ("python-pytest-sugar" ,python-pytest-sugar)
        ("python-pytz" ,python-pytz)))
     (propagated-inputs
-     `(("python-anyjson" ,python-anyjson)
-       ("python-amqp" ,python-amqp)
-       ("python-redis" ,python-redis)))
+     `(("python-amqp" ,python-amqp)
+       ("python-cached-property" ,python-cached-property)
+       ("python-vine" ,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.30.2

[bug#50018] [PATCH 14/19] gnu: Add python-pytest-celery.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 148dfd5fad..18e3a27a18 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1156,6 +1156,26 @@ also ensuring that the notebooks are running without errors.")
      "This pytest plugin provides fixtures to simplify Flask app testing.")
     (license license:expat)))
 
+(define-public python-pytest-celery
+  (package
+    (name "python-pytest-celery")
+    (version "0.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-celery" version))
+       (sha256
+        (base32 "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g"))))
+    (build-system python-build-system)
+    (arguments
+     ;; No tests and causes a circular dependency with python-celery.
+     `(#:tests? #f))
+    (home-page "https://github.com/graingert/pytest-celery")
+    (synopsis "Shim pytest plugin to enable @code{celery.contrib.pytest}")
+    (description
+     "This package provides a shim Pytest plugin to enable a Celery marker.")
+    (license license:bsd-3)))
+
 (define-public python-pytest-env
   (package
     (name "python-pytest-env")
-- 
2.30.2

[bug#50018] [PATCH 15/19] gnu: python-celery: Update to 5.1.2.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery): Update to 5.1.2.
[source]: Make some cosmetic changes.
[propagated-inputs]: Add python-boto3, python-click, python-click-didyoumean,
python-click-plugins, python-click-repl, python-cryptography, python-vine.
---
 gnu/packages/python-xyz.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f14f40e55e..175bab1b89 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13335,14 +13335,13 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
 (define-public python-celery
   (package
     (name "python-celery")
-    (version "4.2.1")
+    (version "5.1.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "celery" version))
        (sha256
-        (base32
-         "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"))))
+        (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
      '(;; TODO The tests fail with Python 3.7
@@ -13360,9 +13359,17 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
      `(("python-case" ,python-case)
        ("python-pytest" ,python-pytest)))
     (propagated-inputs
-     `(("python-pytz" ,python-pytz)
-       ("python-billiard" ,python-billiard)
-       ("python-kombu" ,python-kombu)))
+     `(("python-billiard" ,python-billiard)
+       ("python-boto3" ,python-boto3)
+       ("python-click" ,python-click)
+       ("python-click-didyoumean"
+        ,python-click-didyoumean)
+       ("python-click-plugins" ,python-click-plugins)
+       ("python-click-repl" ,python-click-repl)
+       ("python-cryptography" ,python-cryptography)
+       ("python-kombu" ,python-kombu)
+       ("python-pytz" ,python-pytz)
+       ("python-vine" ,python-vine)))
     (home-page "https://celeryproject.org")
     (synopsis "Distributed Task Queue")
     (description "Celery is an asynchronous task queue/job queue based on
-- 
2.30.2

[bug#50018] [PATCH 16/19] gnu: python-celery: Enable tests.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery)[arguments]: Remove
'patch-requirements phase. Remove #:tests?. Override 'check phase.
[native-inputs]: Add python-flaky, python-iniconfig, python-moto,
python-pytest-celery, python-pytest-subtests, python-pytest-timeout, python-toml.
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 175bab1b89..21b2d59d8a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13344,20 +13344,32 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
         (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
-     '(;; TODO The tests fail with Python 3.7
-       ;; https://github.com/celery/celery/issues/4849
-       #:tests? #f
-       #:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-requirements
+         (add-after 'unpack 'skip-problematic-tests
            (lambda _
-             (substitute* "requirements/test.txt"
-               (("pytest>=3\\.0,<3\\.3")
-                "pytest>=3.0"))
-             #t)))))
+             (for-each delete-file-recursively
+                       '("t/distro" ; tests requirements for CI
+                         "t/integration" ; hangs tests
+                         ;; XXX: Requires many extra dependencies and network.
+                         "t/unit/backends"))))
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest" "t" "-k"
+                       ;; AssertionError.
+                       "not test_check_privileges_no_fchown")))))))
     (native-inputs
      `(("python-case" ,python-case)
-       ("python-pytest" ,python-pytest)))
+       ("python-flaky" ,python-flaky)
+       ("python-iniconfig" ,python-iniconfig)
+       ("python-moto" ,python-moto)
+       ("python-pytest" ,python-pytest-6)
+       ("python-pytest-celery" ,python-pytest-celery)
+       ("python-pytest-subtests" ,python-pytest-subtests)
+       ("python-pytest-timeout" ,python-pytest-timeout)
+       ("python-toml" ,python-toml)))
     (propagated-inputs
      `(("python-billiard" ,python-billiard)
        ("python-boto3" ,python-boto3)
-- 
2.30.2

[bug#50018] [PATCH 17/19] gnu: Remove python2-celery.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-celery): Remove variable.
(python-celery)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 21b2d59d8a..a71ff206a7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13390,16 +13390,7 @@ supports scheduling as well.  The execution units, called tasks, are executed
 concurrently on a single or more worker servers using multiprocessing,
 Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-celery))))))
-
-(define-public python2-celery
-  (let ((celery (package-with-python2
-                 (strip-python2-variant python-celery))))
-    (package/inherit celery
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs celery))))))
+    (license license:bsd-3)))
 
 (define-public python-translitcodec
   (package
-- 
2.30.2

[bug#50018] [PATCH 18/19] gnu: Remove python2-kombu.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-kombu): Remove variable.
(python-kombu)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a71ff206a7..ffb745f168 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13284,19 +13284,7 @@ and also provide proven and tested solutions to common messaging problems.
 AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
 message orientation, queuing, routing, reliability and security, for which the
 RabbitMQ messaging server is the most popular implementation.")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-kombu))))))
-
-(define-public python2-kombu
-  (let ((kombu (package-with-python2
-                (strip-python2-variant python-kombu))))
-    (package/inherit kombu
-      (arguments `(;; FIXME: 'TestTransport.test_del_sync' fails on python2.
-                   ;; It works fine on the python3 variant.
-                   #:tests? #f
-                   ,@(package-arguments kombu)))
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                ,@(package-native-inputs kombu))))))
+    (license license:bsd-3)))
 
 (define-public python-billiard
   (package
-- 
2.30.2

[bug#50018] [PATCH 19/19] gnu: Remove python2-amqp.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-amqp): Remove variable.
(python-amqp)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ffb745f168..9300b40d00 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13206,18 +13206,7 @@ and provides a uniform API regardless of which JSON implementation is used.")
      "This is a fork of amqplib which was originally written by Barry Pederson.
 It is maintained by the Celery project, and used by kombu as a pure python
 alternative when librabbitmq is not available.")
-    (license license:lgpl2.1+)
-    (properties `((python2-variant . ,(delay python2-amqp))))))
-
-(define-public python2-amqp
-  (let ((amqp (package-with-python2
-               (strip-python2-variant python-amqp))))
-    (package/inherit amqp
-      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
-                   ;; unmaintained.  Weirdly, does not do this on the python 3
-                   ;; version?
-                   #:tests? #f
-                   ,@(package-arguments amqp))))))
+    (license license:lgpl2.1+)))
 
 (define-public python-txamqp
   (package
-- 
2.30.2

[bug#50018] [PATCH v2 16/19] gnu: python-celery: Enable tests.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery)[arguments]: Remove
'patch-requirements phase. Remove #:tests?. Override 'check phase.
[native-inputs]: Add python-flaky, python-iniconfig, python-moto,
python-msgpack, python-pytest-celery, python-pytest-subtests,
python-pytest-timeout, python-toml.
---
Enabled backend tests and added python-msgpack to native-inputs. Subsequent patches are rebase only.

 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 175bab1b89..772e04f5c6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13344,20 +13344,31 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
         (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
-     '(;; TODO The tests fail with Python 3.7
-       ;; https://github.com/celery/celery/issues/4849
-       #:tests? #f
-       #:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-requirements
+         (add-after 'unpack 'skip-problematic-tests
            (lambda _
-             (substitute* "requirements/test.txt"
-               (("pytest>=3\\.0,<3\\.3")
-                "pytest>=3.0"))
-             #t)))))
+             (for-each delete-file-recursively
+                       '("t/distro" ; tests requirements for CI
+                         "t/integration")))) ; hangs tests
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest" "t" "-k"
+                       ;; AssertionError.
+                       "not test_check_privileges_no_fchown")))))))
     (native-inputs
      `(("python-case" ,python-case)
-       ("python-pytest" ,python-pytest)))
+       ("python-flaky" ,python-flaky)
+       ("python-iniconfig" ,python-iniconfig)
+       ("python-moto" ,python-moto)
+       ("python-msgpack" ,python-msgpack)
+       ("python-pytest" ,python-pytest-6)
+       ("python-pytest-celery" ,python-pytest-celery)
+       ("python-pytest-subtests" ,python-pytest-subtests)
+       ("python-pytest-timeout" ,python-pytest-timeout)
+       ("python-toml" ,python-toml)))
     (propagated-inputs
      `(("python-billiard" ,python-billiard)
        ("python-boto3" ,python-boto3)
-- 
2.30.2

[bug#50018] [PATCH v2 17/19] gnu: Remove python2-celery.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-celery): Remove variable.
(python-celery)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 772e04f5c6..b287ec1935 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13389,16 +13389,7 @@ supports scheduling as well.  The execution units, called tasks, are executed
 concurrently on a single or more worker servers using multiprocessing,
 Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-celery))))))
-
-(define-public python2-celery
-  (let ((celery (package-with-python2
-                 (strip-python2-variant python-celery))))
-    (package/inherit celery
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs celery))))))
+    (license license:bsd-3)))
 
 (define-public python-translitcodec
   (package
-- 
2.30.2

[bug#50018] [PATCH v2 18/19] gnu: Remove python2-kombu.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-kombu): Remove variable.
(python-kombu)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b287ec1935..4c29c044fb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13284,19 +13284,7 @@ and also provide proven and tested solutions to common messaging problems.
 AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
 message orientation, queuing, routing, reliability and security, for which the
 RabbitMQ messaging server is the most popular implementation.")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-kombu))))))
-
-(define-public python2-kombu
-  (let ((kombu (package-with-python2
-                (strip-python2-variant python-kombu))))
-    (package/inherit kombu
-      (arguments `(;; FIXME: 'TestTransport.test_del_sync' fails on python2.
-                   ;; It works fine on the python3 variant.
-                   #:tests? #f
-                   ,@(package-arguments kombu)))
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                ,@(package-native-inputs kombu))))))
+    (license license:bsd-3)))
 
 (define-public python-billiard
   (package
-- 
2.30.2

[bug#50018] [PATCH v2 19/19] gnu: Remove python2-amqp.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-amqp): Remove variable.
(python-amqp)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4c29c044fb..c8faedcf82 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13206,18 +13206,7 @@ and provides a uniform API regardless of which JSON implementation is used.")
      "This is a fork of amqplib which was originally written by Barry Pederson.
 It is maintained by the Celery project, and used by kombu as a pure python
 alternative when librabbitmq is not available.")
-    (license license:lgpl2.1+)
-    (properties `((python2-variant . ,(delay python2-amqp))))))
-
-(define-public python2-amqp
-  (let ((amqp (package-with-python2
-               (strip-python2-variant python-amqp))))
-    (package/inherit amqp
-      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
-                   ;; unmaintained.  Weirdly, does not do this on the python 3
-                   ;; version?
-                   #:tests? #f
-                   ,@(package-arguments amqp))))))
+    (license license:lgpl2.1+)))
 
 (define-public python-txamqp
   (package
-- 
2.30.2

[bug#50018] [PATCH v3 00/21] Update Celery to version 5.

[Vinicius Monego]

This v3 skips patches 4 and 6 because they were pushed from another set.

It also adds updates to botocore, s3transfer, boto3 and awscli to enable more tests in python-moto which is also updated to 2.2.7.

I noticed that there is intention to package MediaGoblin which requires celery < 4.3.0 in setup.cfg [1]. The latest Celery 4 version is 4.4.7. Will MediaGoblin be updated to Celery 5? Other web apps have moved to celery 5 by now (Weblate, Flaskbb...)

Patches 1-11 should be non-controversial. An older version of celery can also be added later if needed.

Vinicius Monego (21):
  gnu: Add python-click-repl.
  gnu: Add python-click-didyoumean.
  gnu: Add python-pytest-subtests.
  gnu: python-cfn-lint: Respect #:tests?.
  gnu: python-botocore: Update to 1.21.42.
  gnu: python-s3transfer: Update to 0.5.0.
  gnu: python-boto3: Update to 1.18.42.
  gnu: awscli: Update to 1.20.42.
  gnu: python-aws-sam-translator: Change source for tests.
  gnu: python-moto: Update to 2.2.7.
  gnu: python-moto: Respect #:tests?.
  gnu: python-vine: Update to 5.0.0.
  gnu: Add python-pytest-rerunfailures.
  gnu: python-amqp: Update to 5.0.6.
  gnu: python-kombu: Update to 5.1.0.
  gnu: Add python-pytest-celery.
  gnu: python-celery: Update to 5.1.2.
  gnu: python-celery: Enable tests.
  gnu: Remove python2-celery.
  gnu: Remove python2-kombu.
  gnu: Remove python2-amqp.

-- 
2.30.2

[bug#50018] [PATCH v3 01/21] gnu: Add python-click-repl.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-click-repl): New variable.
---
 gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c7045a604e..675437b726 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4104,6 +4104,40 @@ via commands such as @command{rst2man}, as well as supporting Python code.")
 format.")
     (license license:unlicense)))
 
+(define-public python-click-repl
+  (package
+    (name "python-click-repl")
+    (version "0.2.0")
+    (source
+     (origin
+       ;; There are no tests in the PyPI tarball.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/click-contrib/click-repl")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16ybsnwlj2jlqcfxflky8jz7i3nhrd3f6mvkpgs95618l8lx994i"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (propagated-inputs
+     `(("python-click" ,python-click)
+       ("python-prompt-toolkit" ,python-prompt-toolkit)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/untitaker/click-repl")
+    (synopsis "REPL plugin for Click")
+    (description "This package provides a REPL plugin for Click.")
+    (license license:expat)))
+
 (define-public python-doc8
   (package
     (name "python-doc8")
-- 
2.30.2

[bug#50018] [PATCH v3 02/21] gnu: Add python-click-didyoumean.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-click-didyoumean): New variable.
---
 gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 675437b726..9262650afa 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6961,6 +6961,40 @@ in an image.  It then applies the colors system-wide and on-the-fly in all of
 your favourite programs.")
     (license license:expat)))
 
+(define-public python-click-didyoumean
+  (package
+    (name "python-click-didyoumean")
+    (version "0.0.3")
+    (source
+     (origin
+       ;; There are no tests in the PyPI tarball.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/click-contrib/click-didyoumean")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0qb3csx27vby8w5534l4la08sq2nv7wb2fzghv1glrxnxk1a73vg"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; FIXME: tests fail because of single/double quote mismatch
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (propagated-inputs
+     `(("python-click" ,python-click)))
+    (home-page "https://github.com/timofurrer/click-didyoumean")
+    (synopsis "Git-like did-you-mean feature in Click")
+    (description
+     "This plugin enables git-like did-you-mean feature in Click.")
+    (license license:expat)))
+
 (define-public python-pywinrm
   (package
     (name "python-pywinrm")
-- 
2.30.2

[bug#50018] [PATCH v3 03/21] gnu: Add python-pytest-subtests.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index b8d63b8479..18d14a5966 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -576,6 +576,34 @@ in Pytest.")
  settings.")
     (license license:expat)))
 
+(define-public python-pytest-subtests
+  (package
+    (name "python-pytest-subtests")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-subtests" version))
+       (sha256
+        (base32 "087i03nmkmfnrpc7mmizvr40ijnjw4lfxc22rnk8jk6s1szy9lav"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-setuptools-scm" ,python-setuptools-scm)))
+    (home-page "https://github.com/pytest-dev/pytest-subtests")
+    (synopsis "Unittest subTest() support and subtests fixture")
+    (description "This Pytest plugin provides unittest @code{subTest()}
+support and @code{subtests} fixture.")
+    (license license:expat)))
+
 (define-public python-pytest-vcr
   ;; This commit fixes integration with pytest-5
   (let ((commit "4d6c7b3e379a6a7cba0b8f9d20b704dc976e9f05")
-- 
2.30.2

[bug#50018] [PATCH v3 04/21] gnu: python-cfn-lint: Respect #:tests?.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-cfn-lint)[arguments]: Make some cosmetic
changes. Respect #:tests? in the custom 'check phase.
---
 gnu/packages/python-web.scm | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e1742cf71b..8e0f768087 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -492,23 +492,25 @@ emit information from within their applications to the AWS X-Ray service.")
                 "161mzzlpbi85q43kwzrj39qb32l6wg6xhnbbd4z860yrfbymsn87"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out")))
-                        ;; Remove test for the documentation update scripts
-                        ;; to avoid a dependency on 'git'.
-                        (delete-file
-                         "test/unit/module/maintenance/test_update_documentation.py")
-                        (delete-file
-                         "test/unit/module/maintenance/test_update_resource_specs.py")
-                        (setenv "PYTHONPATH"
-                                (string-append "./build/lib:"
-                                               (getenv "PYTHONPATH")))
-                        (setenv "PATH" (string-append out "/bin:"
-                                                      (getenv "PATH")))
-                        (invoke "python" "-m" "unittest" "discover" "-v"
-                                "-s" "test")))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key outputs tests? #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 ;; Remove test for the documentation update scripts
+                 ;; to avoid a dependency on 'git'.
+                 (delete-file
+                  "test/unit/module/maintenance/test_update_documentation.py")
+                 (delete-file
+                  "test/unit/module/maintenance/test_update_resource_specs.py")
+                 (setenv "PYTHONPATH"
+                         (string-append "./build/lib:"
+                                        (getenv "PYTHONPATH")))
+                 (setenv "PATH" (string-append out "/bin:"
+                                               (getenv "PATH")))
+                 (invoke "python" "-m" "unittest" "discover"
+                         "-s" "test"))))))))
     (native-inputs
      `(("python-pydot" ,python-pydot)
        ("python-mock" ,python-mock)))
-- 
2.30.2

[bug#50018] [PATCH v3 05/21] gnu: python-botocore: Update to 1.21.42.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-botocore): Update to 1.21.42.
---
 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 9262650afa..38acf05d37 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13031,14 +13031,14 @@ This software is unmaintained, and new projects should use @code{boto3} instead.
   ;; are compatible.
   (package
     (name "python-botocore")
-    (version "1.19.22")
+    (version "1.21.42")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "botocore" version))
        (sha256
         (base32
-         "0iim86x7c6hqmvd61ygz6x6x9glnsfbnyzv2y67qjdcdx8jpkmw7"))))
+         "067srdizkdfpqg7jpqgy0gv8rqxsbgjfivs50125ndk814hd2lh9"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: Many tests are failing.
-- 
2.30.2

[bug#50018] [PATCH v3 06/21] gnu: python-s3transfer: Update to 0.5.0.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-s3transfer): Update to 0.5.0.
[arguments]<#:phases>: Remove 'patch phase because the issue was fixed
upstream. Don't return #t in custom 'check phase.
---
 gnu/packages/python-web.scm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8e0f768087..bb42c3b136 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3392,32 +3392,22 @@ Betamax that may possibly end up in the main package.")
 (define-public python-s3transfer
   (package
     (name "python-s3transfer")
-    (version "0.3.3")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "s3transfer" version))
               (sha256
                (base32
-                "1nzp5kwmy9669334shcz9ipg89jgpdqhrmbkgdg18r7wmvi3f6lj"))))
+                "0k6sc956yrrv9b4laa0r79jhxajpyxr21jcd1ka8m1n53lz85vah"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             ;; There's a small issue with one test with Python 3.8, this
-             ;; change has been suggested upstream:
-             ;; https://github.com/boto/s3transfer/pull/164
-             (substitute* "tests/unit/test_s3transfer.py"
-               (("super\\(FailedDownloadParts, self\\)\\.submit\\(function\\)")
-                "futures.Future()"))
-             #t))
          (replace 'check
            (lambda _
              ;; Some of the 'integration' tests require network access or
              ;; login credentials.
-             (invoke "nosetests" "--exclude=integration")
-             #t)))))
+             (invoke "nosetests" "--exclude=integration"))))))
     (native-inputs
      `(("python-docutils" ,python-docutils)
        ("python-mock" ,python-mock)
-- 
2.30.2

[bug#50018] [PATCH v3 07/21] gnu: python-boto3: Update to 1.18.42.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-boto3): Update to 1.18.42.
[arguments]<#:phases>: Don't return #t.
---
 gnu/packages/python-xyz.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 38acf05d37..2b737bc029 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13059,7 +13059,7 @@ interface to the Amazon Web Services (AWS) API.")
 (define-public python-boto3
   (package
     (name "python-boto3")
-    (version "1.16.22")
+    (version "1.18.42")
     (home-page "https://github.com/boto/boto3")
     (source (origin
               (method git-fetch)
@@ -13067,15 +13067,14 @@ interface to the Amazon Web Services (AWS) API.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0h20hgl4yfl58g75qhb6ibrdmzn47md3srgar7hask14cjmfhfy3"))))
+                "022a77lmf9qmbzvr7p0g0ggxagycmg489zf4649pffygfzbiqyqx"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'delete-network-tests
            ;; Deleting integration tests because they are trying to connect to AWS.
 	   (lambda _
-	     (delete-file-recursively "tests/integration")
-	     #t)))))
+	     (delete-file-recursively "tests/integration"))))))
     (build-system python-build-system)
     (native-inputs
      `(("python-nose" ,python-nose)
-- 
2.30.2

[bug#50018] [PATCH v3 08/21] gnu: awscli: Update to 1.20.42.

[Vinicius Monego]

* gnu/packages/python-web.scm (awscli): Update to 1.20.42.
[arguments]<#:phases>: Don't return #t.
---
 gnu/packages/python-web.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index bb42c3b136..5449911f3f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2854,14 +2854,14 @@ supports url redirection and retries, and also gzip and deflate decoding.")
   (package
     ;; Note: updating awscli typically requires updating botocore as well.
     (name "awscli")
-    (version "1.18.203")
+    (version "1.20.42")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri name version))
        (sha256
         (base32
-         "128zg24961j8nmnq2dxqg6a7zwh3qgv87cmvclsdqwwih9nigxv9"))))
+         "0fzlf42by4xxl23higfcgdjpcpi7fp9mrxpwkwn13wxhki4p7x96"))))
     (build-system python-build-system)
     (arguments
      ;; FIXME: The 'pypi' release does not contain tests.
@@ -2874,8 +2874,7 @@ supports url redirection and retries, and also gzip and deflate decoding.")
                (("if not self._exists_on_path\\('groff'\\):") "")
                (("raise ExecutableNotFoundError\\('groff'\\)") "")
                (("cmdline = \\['groff'")
-                (string-append "cmdline = ['" (which "groff") "'")))
-             #t)))))
+                (string-append "cmdline = ['" (which "groff") "'"))))))))
     (propagated-inputs
      `(("python-colorama" ,python-colorama)
        ("python-botocore" ,python-botocore)
-- 
2.30.2

[bug#50018] [PATCH v3 09/21] gnu: python-aws-sam-translator: Change source for tests.

[Vinicius Monego]

* gnu/packages/python-web.scm (python-aws-sam-translator)[source]: Fetch from
GitHub. Make some cosmetic changes.
[arguments]: Change explanation on why tests are disabled. Make some cosmetic
changes.
[native-inputs]: Add python-black, python-click, python-coverage,
python-dateparser, python-docopt, python-flake8, python-mock,
python-parameterized, python-pathlib2, python-pylint, python-pytest,
python-pytest-cov, python-pyyaml, python-requests.
---
 gnu/packages/python-web.scm | 57 +++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5449911f3f..fc3f1473af 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -377,26 +377,47 @@ WSGI.  This package includes libraries for implementing ASGI servers.")
   (package
     (name "python-aws-sam-translator")
     (version "1.38.0")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "aws-sam-translator" version))
-              (sha256
-               (base32
-                "1djwlsjpbh13m4biglimrm9lq7hmla0k29giay7k3cjsrylxvjhf"))))
+    (source
+     (origin
+       ;; PyPI tarball does not include tests.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aws/serverless-application-model")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nn9jfqz13kzmxm0r9vy24p8sqxv3mrm5d3lx7ah6rc581q8nv1k"))))
     (build-system python-build-system)
     (arguments
-     `(;; XXX: Tests are not distributed with the PyPI archive, and would
-       ;; introduce a circular dependency on python-cfn-lint.
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'loosen-requirements
-                    (lambda _
-                      ;; The package needlessly specifies exact versions
-                      ;; of dependencies, when it works fine with others.
-                      (substitute* "requirements/base.txt"
-                        (("(.*)(~=[0-9\\.]+)" all package version)
-                         package))
-                      #t)))))
+     ;; FIXME: 25 test failures divided in the following two errors:
+     ;; 'botocore.exceptions.NoRegionError: You must specify a region.'
+     ;; AttributeError: 'TestDeploymentPreferenceCollection' object has
+     ;; no attribute 'function_logical_id'.
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'loosen-requirements
+           (lambda _
+             ;; The package needlessly specifies exact versions
+             ;; of dependencies, when it works fine with others.
+             (substitute* "requirements/base.txt"
+               (("(.*)(~=[0-9\\.]+)" all package version)
+                package)))))))
+    (native-inputs
+     `(("python-black" ,python-black)
+       ("python-click" ,python-click)
+       ("python-coverage" ,python-coverage)
+       ("python-dateparser" ,python-dateparser)
+       ("python-docopt" ,python-docopt)
+       ("python-flake8" ,python-flake8)
+       ("python-mock" ,python-mock)
+       ("python-parameterized" ,python-parameterized)
+       ("python-pathlib2" ,python-pathlib2)
+       ("python-pylint" ,python-pylint)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-requests" ,python-requests)))
     (propagated-inputs
      `(("python-boto3" ,python-boto3)
        ("python-jsonschema" ,python-jsonschema)
-- 
2.30.2

[bug#50018] [PATCH v3 10/21] gnu: python-moto: Update to 2.2.7.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-moto): Update to 2.2.7.
[arguments]: Make some cosmetic changes. Skip more tests. Don't return #t on
phases.
---
 gnu/packages/python-xyz.scm | 49 +++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2b737bc029..b2be163eec 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12653,34 +12653,41 @@ text.")
 (define-public python-moto
   (package
     (name "python-moto")
-    ;; XXX: Use a pre-release for compatibility with latest botocore & friends.
-    (version "1.3.16.dev134")
+    (version "2.2.7")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "moto" version))
               (sha256
                (base32
-                "1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
+                "065m24x9d7vlmd7xfa9f5m7829axhq7r6mj5r44hi2bipv833lgm"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'patch-hardcoded-executable-names
-                    (lambda _
-                      (substitute* "moto/batch/models.py"
-                        (("/bin/sh")
-                         (which "sh")))
-                      (substitute* (find-files "tests" "\\.py$")
-                        (("#!/bin/bash")
-                         (string-append "#!" (which "bash"))))
-                      #t))
-                  (replace 'check
-                    (lambda _
-                      (setenv "PYTHONPATH" (string-append "./build/lib:"
-                                                          (getenv "PYTHONPATH")))
-                      (invoke "pytest" "-vv" "-m" "not network"
-                              ;; These tests require Docker.
-                              "-k" "not test_terminate_job \
-and not test_invoke_function_from_sqs_exception"))))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-hardcoded-executable-names
+           (lambda _
+             (substitute* "moto/batch/models.py"
+               (("/bin/sh")
+                (which "sh")))
+             (substitute* (find-files "tests" "\\.py$")
+               (("#!/bin/bash")
+                (string-append "#!" (which "bash"))))))
+         (replace 'check
+           (lambda _
+             (setenv "PYTHONPATH" (string-append "./build/lib:"
+                                                 (getenv "PYTHONPATH")))
+             (invoke "pytest" "-vv" "-m" "not network" "-k"
+                     (string-append
+                      ;; These tests require Docker.
+                      "not test_terminate_job"
+                      " and not test_invoke_function_from_sqs_exception"
+                      " and not test_rotate_secret_lambda_invocations"
+                      ;; ConnectionAborted errors.
+                      " and not test_put_record_batch_http_destination"
+                      " and not test_put_record_http_destination"
+                      " and not test_dependencies"
+                      " and not test_cancel_running_job"
+                      " and not test_container_overrides")))))))
     (native-inputs
      `(("python-flask" ,python-flask)
        ("python-flask-cors" ,python-flask-cors)
-- 
2.30.2

[bug#50018] [PATCH v3 10/21] gnu: python-moto: Update to 2.2.7.

[Maxime Devos]

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

Vinicius Monego schreef op do 16-09-2021 om 16:21 [+0000]:
> * gnu/packages/python-xyz.scm (python-moto): Update to 2.2.7.
> [arguments]: Make some cosmetic changes. Skip more tests. Don't return #t on
> phases.
> ---
>  gnu/packages/python-xyz.scm | 49 +++++++++++++++++++++----------------
>  1 file changed, 28 insertions(+), 21 deletions(-)
> 
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 2b737bc029..b2be163eec 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -12653,34 +12653,41 @@ text.")
>  (define-public python-moto
>    (package
>      (name "python-moto")
> -    ;; XXX: Use a pre-release for compatibility with latest botocore & friends.
> -    (version "1.3.16.dev134")
> +    (version "2.2.7")
>      (source (origin
>                (method url-fetch)
>                (uri (pypi-uri "moto" version))
>                (sha256
>                 (base32
> -                "1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
> +                "065m24x9d7vlmd7xfa9f5m7829axhq7r6mj5r44hi2bipv833lgm"))))
>      (build-system python-build-system)
>      (arguments
> -     `(#:phases (modify-phases %standard-phases
> -                  (add-after 'unpack 'patch-hardcoded-executable-names
> -                    (lambda _
> -                      (substitute* "moto/batch/models.py"
> -                        (("/bin/sh")
> -                         (which "sh")))
> -                      (substitute* (find-files "tests" "\\.py$")
> -                        (("#!/bin/bash")
> -                         (string-append "#!" (which "bash"))))
> -                      #t))
> -                  (replace 'check
> -                    (lambda _
> -                      (setenv "PYTHONPATH" (string-append "./build/lib:"
> -                                                          (getenv "PYTHONPATH")))
> -                      (invoke "pytest" "-vv" "-m" "not network"
> -                              ;; These tests require Docker.
> -                              "-k" "not test_terminate_job \
> -and not test_invoke_function_from_sqs_exception"))))))
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-hardcoded-executable-names
> +           (lambda _
> +             (substitute* "moto/batch/models.py"
> +               (("/bin/sh")
> +                (which "sh")))

This needs to be something like (search-input-file "bin/sh") instead
for cross-compiling python-moto (though python-build-system doesn't
support cross-compilation currently), with "bash-minimal" added to the
inputs.

Or (string-append (assoc-ref inputs "bash-minimal") "/bin/sh"), because
search-input-file is only in core-updates and core-updates-frozen, and not
yet in master.

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50018] [PATCH v3 11/21] gnu: python-moto: Respect #:tests?.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-moto)[source]: Make some cosmetic
changes.
[arguments]: Respect #:tests? in the custom 'check phase.
---
 gnu/packages/python-xyz.scm | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b2be163eec..9f8df19a66 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12673,21 +12673,22 @@ text.")
                (("#!/bin/bash")
                 (string-append "#!" (which "bash"))))))
          (replace 'check
-           (lambda _
-             (setenv "PYTHONPATH" (string-append "./build/lib:"
-                                                 (getenv "PYTHONPATH")))
-             (invoke "pytest" "-vv" "-m" "not network" "-k"
-                     (string-append
-                      ;; These tests require Docker.
-                      "not test_terminate_job"
-                      " and not test_invoke_function_from_sqs_exception"
-                      " and not test_rotate_secret_lambda_invocations"
-                      ;; ConnectionAborted errors.
-                      " and not test_put_record_batch_http_destination"
-                      " and not test_put_record_http_destination"
-                      " and not test_dependencies"
-                      " and not test_cancel_running_job"
-                      " and not test_container_overrides")))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (setenv "PYTHONPATH" (string-append "./build/lib:"
+                                                   (getenv "PYTHONPATH")))
+               (invoke "pytest" "-vv" "-m" "not network" "-k"
+                       (string-append
+                        ;; These tests require Docker.
+                        "not test_terminate_job"
+                        " and not test_invoke_function_from_sqs_exception"
+                        " and not test_rotate_secret_lambda_invocations"
+                        ;; ConnectionAborted errors.
+                        " and not test_put_record_batch_http_destination"
+                        " and not test_put_record_http_destination"
+                        " and not test_dependencies"
+                        " and not test_cancel_running_job"
+                        " and not test_container_overrides"))))))))
     (native-inputs
      `(("python-flask" ,python-flask)
        ("python-flask-cors" ,python-flask-cors)
-- 
2.30.2

[bug#50018] [PATCH v3 12/21] gnu: python-vine: Update to 5.0.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-vine): Update to 5.0.0.
[source]: Make some cosmetic changes.
---
 gnu/packages/python-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9f8df19a66..7b5a63b28f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3730,14 +3730,13 @@ provides Python-specific tags that represent an arbitrary Python object.")
 (define-public python-vine
   (package
     (name "python-vine")
-    (version "1.1.4")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "vine" version))
        (sha256
-        (base32
-         "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj"))))
+        (base32 "0zk3pm0g7s4qfn0gk28lfmsyplvisaxi6826cgpq5njkm4j1cfvx"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-pytest" ,python-pytest)
-- 
2.30.2

[bug#50018] [PATCH v3 13/21] gnu: Add python-pytest-rerunfailures.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 18d14a5966..1e00691a75 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1037,6 +1037,34 @@ service processes for your tests with pytest.")
 new fixtures, new methods and new comparison objects.")
     (license license:expat)))
 
+(define-public python-pytest-rerunfailures
+  (package
+    (name "python-pytest-rerunfailures")
+    (version "10.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-rerunfailures" version))
+       (sha256
+        (base32 "0ws2hbgh00nd6xchyi9ymyxfpg5jpxsy5mxdz4nxvriyw5nw05vn"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest"
+                       "test_pytest_rerunfailures.py")))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (home-page "https://github.com/pytest-dev/pytest-rerunfailures")
+    (synopsis "Pytest plugin to re-run tests to eliminate flaky failures")
+    (description "This package provides a Pytest plugin to re-run tests to
+eliminate flaky failures.")
+    (license license:mpl2.0)))
+
 (define-public python-pytest-aiohttp
   (package
     (name "python-pytest-aiohttp")
-- 
2.30.2

[bug#50018] [PATCH v3 14/21] gnu: python-amqp: Update to 5.0.6.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-amqp): Update to 5.0.6.
[source]: Make some cosmetic changes.
---
 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 7b5a63b28f..f5c1f7768c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13336,17 +13336,24 @@ and provides a uniform API regardless of which JSON implementation is used.")
 (define-public python-amqp
   (package
     (name "python-amqp")
-    (version "2.3.2")
+    (version "5.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "amqp" version))
        (sha256
-        (base32
-         "1sv600dgqwpimr6i1g59y9hpn50mc236gdqkr7zin13kvlpx0g87"))))
+        (base32 "1hk8jli0s8dinxwihskzbwqlrancsgfxh1hjpzw32k5kyaa6xq83"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-rabbitmq-tests
+           (lambda _
+             ;; All tests in this file require RabbitMQ.
+             (delete-file-recursively "t/integration/test_rmq.py"))))))
     (native-inputs
      `(("python-case" ,python-case)
+       ("python-pytest-rerunfailures" ,python-pytest-rerunfailures)
        ("python-pytest-sugar" ,python-pytest-sugar)
        ("python-mock" ,python-mock)))
     (propagated-inputs
-- 
2.30.2

[bug#50018] [PATCH v3 15/21] gnu: python-kombu: Update to 5.1.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-kombu): Update to 5.1.0.
[source]: Make some cosmetic changes.
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f5c1f7768c..a0bb50805d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13410,25 +13410,31 @@ applications.")
 (define-public python-kombu
   (package
     (name "python-kombu")
-    (version "4.2.2")
+    (version "5.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "kombu" version))
        (sha256
-        (base32
-         "15k8f7mzqr049sg9vi48m19vjykviafk3f0p5xzgw9by0x0kyxjj"))))
+        (base32 "0bap3b244h9jhaswyqjg7sgfwlyk9qk3gdn9rlwnjvv0yjcisj01"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-transport-tests
+           (lambda _
+             ;; This tests message passing to many different databases.
+             (delete-file-recursively "t/unit/transport"))))))
     (native-inputs
-     `(("python-mock" ,python-mock)
-       ("python-case" ,python-case)
+     `(("python-case" ,python-case)
+       ("python-mock" ,python-mock)
        ("python-pyro4" ,python-pyro4)
        ("python-pytest-sugar" ,python-pytest-sugar)
        ("python-pytz" ,python-pytz)))
     (propagated-inputs
-     `(("python-anyjson" ,python-anyjson)
-       ("python-amqp" ,python-amqp)
-       ("python-redis" ,python-redis)))
+     `(("python-amqp" ,python-amqp)
+       ("python-cached-property" ,python-cached-property)
+       ("python-vine" ,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.30.2

[bug#50018] [PATCH v3 16/21] gnu: Add python-pytest-celery.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 1e00691a75..a3f105d9ec 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1221,6 +1221,26 @@ fixtures for testing Tornado (version 5.0 or newer) apps and easy handling of
 plain (undecoratored) native coroutine tests.")
     (license license:expat)))
 
+(define-public python-pytest-celery
+  (package
+    (name "python-pytest-celery")
+    (version "0.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-celery" version))
+       (sha256
+        (base32 "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g"))))
+    (build-system python-build-system)
+    (arguments
+     ;; No tests and causes a circular dependency with python-celery.
+     `(#:tests? #f))
+    (home-page "https://github.com/graingert/pytest-celery")
+    (synopsis "Shim pytest plugin to enable @code{celery.contrib.pytest}")
+    (description
+     "This package provides a shim Pytest plugin to enable a Celery marker.")
+    (license license:bsd-3)))
+
 (define-public python-pytest-env
   (package
     (name "python-pytest-env")
-- 
2.30.2

[bug#50018] [PATCH v3 17/21] gnu: python-celery: Update to 5.1.2.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery): Update to 5.1.2.
[source]: Make some cosmetic changes.
[propagated-inputs]: Add python-boto3, python-click, python-click-didyoumean,
python-click-plugins, python-click-repl, python-cryptography, python-vine.
---
 gnu/packages/python-xyz.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a0bb50805d..a3484a94ba 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13494,14 +13494,13 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
 (define-public python-celery
   (package
     (name "python-celery")
-    (version "4.2.1")
+    (version "5.1.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "celery" version))
        (sha256
-        (base32
-         "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"))))
+        (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
      '(;; TODO The tests fail with Python 3.7
@@ -13519,9 +13518,17 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
      `(("python-case" ,python-case)
        ("python-pytest" ,python-pytest)))
     (propagated-inputs
-     `(("python-pytz" ,python-pytz)
-       ("python-billiard" ,python-billiard)
-       ("python-kombu" ,python-kombu)))
+     `(("python-billiard" ,python-billiard)
+       ("python-boto3" ,python-boto3)
+       ("python-click" ,python-click)
+       ("python-click-didyoumean"
+        ,python-click-didyoumean)
+       ("python-click-plugins" ,python-click-plugins)
+       ("python-click-repl" ,python-click-repl)
+       ("python-cryptography" ,python-cryptography)
+       ("python-kombu" ,python-kombu)
+       ("python-pytz" ,python-pytz)
+       ("python-vine" ,python-vine)))
     (home-page "https://celeryproject.org")
     (synopsis "Distributed Task Queue")
     (description "Celery is an asynchronous task queue/job queue based on
-- 
2.30.2

[bug#50018] [PATCH v3 18/21] gnu: python-celery: Enable tests.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery)[arguments]: Remove
'patch-requirements phase. Remove #:tests?. Override 'check phase.
[native-inputs]: Add python-flaky, python-iniconfig, python-moto,
python-msgpack, python-pytest-celery, python-pytest-subtests,
python-pytest-timeout, python-toml.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a3484a94ba..aa0c7118a2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13503,20 +13503,31 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
         (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
-     '(;; TODO The tests fail with Python 3.7
-       ;; https://github.com/celery/celery/issues/4849
-       #:tests? #f
-       #:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-requirements
+         (add-after 'unpack 'skip-problematic-tests
            (lambda _
-             (substitute* "requirements/test.txt"
-               (("pytest>=3\\.0,<3\\.3")
-                "pytest>=3.0"))
-             #t)))))
+             (for-each delete-file-recursively
+                       '("t/distro" ; tests requirements for CI
+                         "t/integration")))) ; hangs tests
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest" "t" "-k"
+                       ;; AssertionError.
+                       "not test_check_privileges_no_fchown")))))))
     (native-inputs
      `(("python-case" ,python-case)
-       ("python-pytest" ,python-pytest)))
+       ("python-flaky" ,python-flaky)
+       ("python-iniconfig" ,python-iniconfig)
+       ("python-moto" ,python-moto)
+       ("python-msgpack" ,python-msgpack)
+       ("python-pytest" ,python-pytest-6)
+       ("python-pytest-celery" ,python-pytest-celery)
+       ("python-pytest-subtests" ,python-pytest-subtests)
+       ("python-pytest-timeout" ,python-pytest-timeout)
+       ("python-toml" ,python-toml)))
     (propagated-inputs
      `(("python-billiard" ,python-billiard)
        ("python-boto3" ,python-boto3)
-- 
2.30.2

[bug#50018] [PATCH v3 19/21] gnu: Remove python2-celery.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-celery): Remove variable.
(python-celery)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index aa0c7118a2..ab04f50b71 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13548,16 +13548,7 @@ supports scheduling as well.  The execution units, called tasks, are executed
 concurrently on a single or more worker servers using multiprocessing,
 Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-celery))))))
-
-(define-public python2-celery
-  (let ((celery (package-with-python2
-                 (strip-python2-variant python-celery))))
-    (package/inherit celery
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs celery))))))
+    (license license:bsd-3)))
 
 (define-public python-translitcodec
   (package
-- 
2.30.2

[bug#50018] [PATCH v3 20/21] gnu: Remove python2-kombu.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-kombu): Remove variable.
(python-kombu)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ab04f50b71..37c5a48bb0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13443,19 +13443,7 @@ and also provide proven and tested solutions to common messaging problems.
 AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
 message orientation, queuing, routing, reliability and security, for which the
 RabbitMQ messaging server is the most popular implementation.")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-kombu))))))
-
-(define-public python2-kombu
-  (let ((kombu (package-with-python2
-                (strip-python2-variant python-kombu))))
-    (package/inherit kombu
-      (arguments `(;; FIXME: 'TestTransport.test_del_sync' fails on python2.
-                   ;; It works fine on the python3 variant.
-                   #:tests? #f
-                   ,@(package-arguments kombu)))
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                ,@(package-native-inputs kombu))))))
+    (license license:bsd-3)))
 
 (define-public python-billiard
   (package
-- 
2.30.2

[bug#50018] [PATCH v3 21/21] gnu: Remove python2-amqp.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-amqp): Remove variable.
(python-amqp)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 37c5a48bb0..6c0d9b8114 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13365,18 +13365,7 @@ and provides a uniform API regardless of which JSON implementation is used.")
      "This is a fork of amqplib which was originally written by Barry Pederson.
 It is maintained by the Celery project, and used by kombu as a pure python
 alternative when librabbitmq is not available.")
-    (license license:lgpl2.1+)
-    (properties `((python2-variant . ,(delay python2-amqp))))))
-
-(define-public python2-amqp
-  (let ((amqp (package-with-python2
-               (strip-python2-variant python-amqp))))
-    (package/inherit amqp
-      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
-                   ;; unmaintained.  Weirdly, does not do this on the python 3
-                   ;; version?
-                   #:tests? #f
-                   ,@(package-arguments amqp))))))
+    (license license:lgpl2.1+)))
 
 (define-public python-txamqp
   (package
-- 
2.30.2

[bug#50018] [PATCH v3 10/21] gnu: python-moto: Update to 2.2.7.

[Vinicius Monego]

> This needs to be something like (search-input-file "bin/sh") instead
> for cross-compiling python-moto (though python-build-system doesn't
> support cross-compilation currently), with "bash-minimal" added to
> the inputs.
> 
> Or (string-append (assoc-ref inputs "bash-minimal") "/bin/sh"),
> because search-input-file is only in core-updates and core-updates-
> frozen, and not yet in master.
> 
> Greetings,
> Maxime

I submitted the python-moto update in the new issue #51396 with the
suggested change.

I will hold the Celery update until the moto update is merged, to make
it easier to review since some of the patches in this series are only
for moto. This would reduce the number of Celery patches to 13.

[bug#50018] [PATCH v4 01/12] gnu: Add python-click-repl.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-click-repl): New variable.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5e26fe724f..dccf102c34 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4211,6 +4211,37 @@ via commands such as @command{rst2man}, as well as supporting Python code.")
 format.")
     (license license:unlicense)))
 
+(define-public python-click-repl
+  (package
+    (name "python-click-repl")
+    (version "0.2.0")
+    (source
+     (origin
+       (method git-fetch)               ; no tests in PyPI release
+       (uri (git-reference
+             (url "https://github.com/click-contrib/click-repl")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16ybsnwlj2jlqcfxflky8jz7i3nhrd3f6mvkpgs95618l8lx994i"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     (list python-pytest))
+    (propagated-inputs
+     (list python-click python-prompt-toolkit python-six))
+    (home-page "https://github.com/untitaker/click-repl")
+    (synopsis "REPL plugin for Click")
+    (description "This package provides a REPL plugin for Click.")
+    (license license:expat)))
+
 (define-public python-doc8
   (package
     (name "python-doc8")

base-commit: 86d6c6053c7d1c7a82c83f0daf0f5e09b1ecfb63
-- 
2.30.2

[bug#50018] [PATCH v4 02/12] gnu: Add python-click-didyoumean.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-click-didyoumean): New 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 dccf102c34..cbf6bc95d7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7369,6 +7369,27 @@ in an image.  It then applies the colors system-wide and on-the-fly in all of
 your favourite programs.")
     (license license:expat)))
 
+(define-public python-click-didyoumean
+  (package
+    (name "python-click-didyoumean")
+    (version "0.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "click-didyoumean" version))
+       (sha256
+        (base32 "0dc0xrmqbw0idpx843ahzzvivmvx3fcfsm3k54lnssyra7cg117i"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))              ; no tests in PyPI and no setup.py in github
+    (propagated-inputs
+     (list python-click))
+    (home-page "https://github.com/timofurrer/click-didyoumean")
+    (synopsis "Git-like did-you-mean feature in Click")
+    (description
+     "This plugin enables git-like did-you-mean feature in Click.")
+    (license license:expat)))
+
 (define-public python-pywinrm
   (package
     (name "python-pywinrm")
-- 
2.30.2

[bug#50018] [PATCH v4 03/12] gnu: Add python-pytest-subtests.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index e94e2d0011..7c92252818 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -707,6 +707,33 @@ in Pytest.")
  settings.")
     (license license:expat)))
 
+(define-public python-pytest-subtests
+  (package
+    (name "python-pytest-subtests")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-subtests" version))
+       (sha256
+        (base32 "087i03nmkmfnrpc7mmizvr40ijnjw4lfxc22rnk8jk6s1szy9lav"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest")))))))
+    (native-inputs
+     (list python-pytest python-setuptools-scm))
+    (home-page "https://github.com/pytest-dev/pytest-subtests")
+    (synopsis "Unittest subTest() support and subtests fixture")
+    (description "This Pytest plugin provides unittest @code{subTest()}
+support and @code{subtests} fixture.")
+    (license license:expat)))
+
 (define-public python-pytest-vcr
   ;; This commit fixes integration with pytest-5
   (let ((commit "4d6c7b3e379a6a7cba0b8f9d20b704dc976e9f05")
-- 
2.30.2

[bug#50018] [PATCH v4 04/12] gnu: Add python-pytest-rerunfailures.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 7c92252818..c0436afea7 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1145,6 +1145,34 @@ service processes for your tests with pytest.")
 new fixtures, new methods and new comparison objects.")
     (license license:expat)))
 
+(define-public python-pytest-rerunfailures
+  (package
+    (name "python-pytest-rerunfailures")
+    (version "10.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-rerunfailures" version))
+       (sha256
+        (base32 "15v68kggjvkflbqr0vz8gp5yp3pcsk0rz05bpg2l4xp0a6nin7ly"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest"
+                       "test_pytest_rerunfailures.py")))))))
+    (native-inputs
+     (list python-pytest))
+    (home-page "https://github.com/pytest-dev/pytest-rerunfailures")
+    (synopsis "Pytest plugin to re-run tests to eliminate flaky failures")
+    (description "This package provides a Pytest plugin to re-run tests to
+eliminate flaky failures.")
+    (license license:mpl2.0)))
+
 (define-public python-pytest-aiohttp
   (package
     (name "python-pytest-aiohttp")
-- 
2.30.2

[bug#50018] [PATCH v4 05/12] gnu: Add python-pytest-celery.

[Vinicius Monego]

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

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index c0436afea7..48f22c681a 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1321,6 +1321,28 @@ fixtures for testing Tornado (version 5.0 or newer) apps and easy handling of
 plain (undecoratored) native coroutine tests.")
     (license license:expat)))
 
+(define-public python-pytest-celery
+  (package
+    (name "python-pytest-celery")
+    (version "0.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-celery" version))
+       (sha256
+        (base32 "01pli108qqiiyrn8qsqqabcpazrzj27r7cji9wgglsk76by61l6g"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; no tests and circular dependency on python-celery
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'sanity-check)))) ; checks for celery
+    (home-page "https://github.com/graingert/pytest-celery")
+    (synopsis "Shim pytest plugin to enable @code{celery.contrib.pytest}")
+    (description
+     "This package provides a shim Pytest plugin to enable a Celery marker.")
+    (license license:bsd-3)))
+
 (define-public python-pytest-env
   (package
     (name "python-pytest-env")
-- 
2.30.2

[bug#50018] [PATCH v4 06/12] gnu: python-billiard: Update to 3.6.4.0.

[Vinicius Monego]

* gnu/packages/python-xyz (python-billiard): Update to 3.6.4.0.
[source]: Make some cosmetic changes.
[arguments]: Add 'remove-win-files to remove files that break tests.
[native-inputs]: Add python-psutil.
[synopsis]: Don't break the line.
---
 gnu/packages/python-xyz.scm | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cbf6bc95d7..a7493cb0ec 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14003,20 +14003,29 @@ RabbitMQ messaging server is the most popular implementation.")
 (define-public python-billiard
   (package
     (name "python-billiard")
-    (version "3.5.0.5")
+    (version "3.6.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "billiard" version))
        (sha256
-        (base32
-         "03msmapj3s5zgqk87d646mafz7a01h5bm2wijalgpi0s80ks5na2"))))
+        (base32 "0ismj2p8c66ykpss94rs0bfra5agxxmljz8r3gaq79r8valfb799"))))
     (build-system python-build-system)
-    (native-inputs
-     (list python-case python-pytest))
+    (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")))))))
+    (native-inputs
+     (list python-case python-psutil python-pytest))
     (home-page "https://github.com/celery/billiard")
-    (synopsis
-     "Python multiprocessing fork with improvements and bugfixes")
+    (synopsis "Python multiprocessing fork with improvements and bugfixes")
     (description
      "Billiard is a fork of the Python 2.7 multiprocessing package.  The
 multiprocessing package itself is a renamed and updated version of R Oudkerk's
-- 
2.30.2

[bug#50018] [PATCH v4 07/12] gnu: python-celery: Update to 5.

[Vinicius Monego]

Celery tracks major versions of python-kombu and python-vine. The latter
is also tracked by the major version of python-amqp.

* gnu/packages/python-xyz.scm (python-celery): Update to 5.1.2.
[source]: Make some cosmetic changes.
[propagated-inputs]: Add python-boto3, python-click, python-click-didyoumean,
python-click-plugins, python-click-repl, python-cryptography, python-vine.
(python-kombu): Update to 5.2.2.
[source]: Make some cosmetic changes.
[arguments]<#:phases>: Skip a problematic test file.
[native-inputs]: Order alphabetically.
[propagated-inputs]: Remove python-anyjson, python-redis. ADd
python-cachedproperty, python-vine.
(python-amqp): Update to 5.0.7.
[source]: Make some cosmetic changes.
[arguments]: Add #:tests? to skip tests.
[synopsis]: Don't break the line.
[native-inputs]: Remove python-case, python-pytest-sugar, python-mock.
(python-vine): Update to 5.0.0.
[source]: Make some cosmetic changes.
---
 gnu/packages/python-xyz.scm | 41 ++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a7493cb0ec..00a834a33a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3803,14 +3803,13 @@ provides Python-specific tags that represent an arbitrary Python object.")
 (define-public python-vine
   (package
     (name "python-vine")
-    (version "1.1.4")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "vine" version))
        (sha256
-        (base32
-         "0wkskb2hb494v9gixqnf4bl972p4ibcmxdykzpwjlfa5picns4aj"))))
+        (base32 "0zk3pm0g7s4qfn0gk28lfmsyplvisaxi6826cgpq5njkm4j1cfvx"))))
     (build-system python-build-system)
     (native-inputs
      (list python-pytest python-case))
@@ -13903,22 +13902,20 @@ and provides a uniform API regardless of which JSON implementation is used.")
 (define-public python-amqp
   (package
     (name "python-amqp")
-    (version "2.3.2")
+    (version "5.0.7")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "amqp" version))
        (sha256
-        (base32
-         "1sv600dgqwpimr6i1g59y9hpn50mc236gdqkr7zin13kvlpx0g87"))))
+        (base32 "0p9alyinl24z699w4gpd8wvn90sm2il1p0gfwdhbpinksy7vfmyp"))))
     (build-system python-build-system)
-    (native-inputs
-     (list python-case python-pytest-sugar python-mock))
+    (arguments
+     `(#:tests? #f)) ; not compatible with pytest>=6 as of 5.0.7
     (propagated-inputs
      (list python-vine))
     (home-page "https://github.com/celery/py-amqp")
-    (synopsis
-     "Low-level AMQP client for Python (fork of amqplib)")
+    (synopsis "Low-level AMQP client for Python (fork of amqplib)")
     (description
      "This is a fork of amqplib which was originally written by Barry Pederson.
 It is maintained by the Celery project, and used by kombu as a pure python
@@ -13964,20 +13961,25 @@ applications.")
 (define-public python-kombu
   (package
     (name "python-kombu")
-    (version "4.2.2")
+    (version "5.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "kombu" version))
        (sha256
-        (base32
-         "15k8f7mzqr049sg9vi48m19vjykviafk3f0p5xzgw9by0x0kyxjj"))))
+        (base32 "0256915q3z4pjrkqxw16a31np3p25dxnk1mq2zv0hs4izdihfp8g"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-transport-tests
+           (lambda _ ; this tests message passing to many different databases
+             (delete-file-recursively "t/unit/transport"))))))
     (native-inputs
-     (list python-mock python-case python-pyro4 python-pytest-sugar
+     (list python-case python-mock python-pyro4 python-pytest-sugar
            python-pytz))
     (propagated-inputs
-     (list python-anyjson python-amqp python-redis))
+     (list python-amqp python-cached-property 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
@@ -14045,14 +14047,13 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
 (define-public python-celery
   (package
     (name "python-celery")
-    (version "4.2.1")
+    (version "5.1.2") ; newer versions require python-click>=8
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "celery" version))
        (sha256
-        (base32
-         "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp"))))
+        (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
      '(;; TODO The tests fail with Python 3.7
@@ -14069,7 +14070,9 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
     (native-inputs
      (list python-case python-pytest))
     (propagated-inputs
-     (list python-pytz python-billiard python-kombu))
+     (list python-billiard python-boto3 python-click python-click-didyoumean
+           python-click-plugins python-click-repl python-cryptography
+           python-kombu python-pytz python-vine))
     (home-page "https://celeryproject.org")
     (synopsis "Distributed Task Queue")
     (description "Celery is an asynchronous task queue/job queue based on
-- 
2.30.2

[bug#50018] [PATCH v4 08/12] gnu: python-celery: Enable tests.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-celery)[arguments]: Remove
'patch-requirements phase. Remove #:tests?. Override 'check phase.
[native-inputs]: Add python-flaky, python-iniconfig, python-moto,
python-msgpack, python-pytest-celery, python-pytest-subtests,
python-pytest-timeout, python-toml.
---
 gnu/packages/python-xyz.scm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 00a834a33a..870685211b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14056,19 +14056,23 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
         (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld"))))
     (build-system python-build-system)
     (arguments
-     '(;; TODO The tests fail with Python 3.7
-       ;; https://github.com/celery/celery/issues/4849
-       #:tests? #f
-       #:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-requirements
+         (add-after 'unpack 'delete-integration-tests
            (lambda _
-             (substitute* "requirements/test.txt"
-               (("pytest>=3\\.0,<3\\.3")
-                "pytest>=3.0"))
-             #t)))))
-    (native-inputs
-     (list python-case python-pytest))
+             (delete-file-recursively "t/integration"))) ; hangs tests
+         (replace 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (when tests?
+               (add-installed-pythonpath inputs outputs)
+               (invoke "python" "-m" "pytest" "t" "-k"
+                       (string-append   ; AssertionErrors
+                        "not test_check_privileges_no_fchown"
+                        " and not test_all_reqs_enabled_in_tests"))))))))
+    (native-inputs
+     (list python-case python-flaky python-iniconfig python-moto
+           python-msgpack python-pytest python-pytest-celery
+           python-pytest-subtests python-pytest-timeout python-toml))
     (propagated-inputs
      (list python-billiard python-boto3 python-click python-click-didyoumean
            python-click-plugins python-click-repl python-cryptography
-- 
2.30.2

[bug#50018] [PATCH v4 09/12] gnu: Remove python2-celery.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-celery): Remove variable.
(python-celery)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 870685211b..0b4f1d3719 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14085,16 +14085,7 @@ supports scheduling as well.  The execution units, called tasks, are executed
 concurrently on a single or more worker servers using multiprocessing,
 Eventlet, or gevent.  Tasks can execute asynchronously (in the background) or
 synchronously (wait until ready).")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-celery))))))
-
-(define-public python2-celery
-  (let ((celery (package-with-python2
-                 (strip-python2-variant python-celery))))
-    (package/inherit celery
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs celery))))))
+    (license license:bsd-3)))
 
 (define-public python-translitcodec
   (package
-- 
2.30.2

[bug#50018] [PATCH v4 10/12] gnu: Remove python2-kombu.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-kombu): Remove variable.
(python-kombu)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0b4f1d3719..b673f01211 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13988,19 +13988,7 @@ and also provide proven and tested solutions to common messaging problems.
 AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
 message orientation, queuing, routing, reliability and security, for which the
 RabbitMQ messaging server is the most popular implementation.")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-kombu))))))
-
-(define-public python2-kombu
-  (let ((kombu (package-with-python2
-                (strip-python2-variant python-kombu))))
-    (package/inherit kombu
-      (arguments `(;; FIXME: 'TestTransport.test_del_sync' fails on python2.
-                   ;; It works fine on the python3 variant.
-                   #:tests? #f
-                   ,@(package-arguments kombu)))
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                ,@(package-native-inputs kombu))))))
+    (license license:bsd-3)))
 
 (define-public python-billiard
   (package
-- 
2.30.2

[bug#50018] [PATCH v4 11/12] gnu: Remove python2-amqp.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-amqp): Remove variable.
(python-amqp)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b673f01211..5887eb9c26 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13920,18 +13920,7 @@ and provides a uniform API regardless of which JSON implementation is used.")
      "This is a fork of amqplib which was originally written by Barry Pederson.
 It is maintained by the Celery project, and used by kombu as a pure python
 alternative when librabbitmq is not available.")
-    (license license:lgpl2.1+)
-    (properties `((python2-variant . ,(delay python2-amqp))))))
-
-(define-public python2-amqp
-  (let ((amqp (package-with-python2
-               (strip-python2-variant python-amqp))))
-    (package/inherit amqp
-      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
-                   ;; unmaintained.  Weirdly, does not do this on the python 3
-                   ;; version?
-                   #:tests? #f
-                   ,@(package-arguments amqp))))))
+    (license license:lgpl2.1+)))
 
 (define-public python-txamqp
   (package
-- 
2.30.2

[bug#50018] [PATCH v4 12/12] gnu: Remove python2-billiard.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python2-billiard): Remove variable.
(python-billiard)[properties]: Remove.
---
 gnu/packages/python-xyz.scm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5887eb9c26..309bfd5161 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14010,16 +14010,7 @@ RabbitMQ messaging server is the most popular implementation.")
 multiprocessing package itself is a renamed and updated version of R Oudkerk's
 pyprocessing package.  This standalone variant is intended to be compatible with
 Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
-    (license license:bsd-3)
-    (properties `((python2-variant . ,(delay python2-billiard))))))
-
-(define-public python2-billiard
-  (let ((billiard (package-with-python2
-                   (strip-python2-variant python-billiard))))
-    (package/inherit billiard
-      (native-inputs `(("python2-unittest2" ,python2-unittest2)
-                       ("python2-mock" ,python2-mock)
-                       ,@(package-native-inputs billiard))))))
+    (license license:bsd-3)))
 
 (define-public python-celery
   (package
-- 
2.30.2

bug#50018: [PATCH 00/19] Update Celery to version 5.

[Nicolas Goaziou]

Hello,

Vinicius Monego <monego@posteo.net> writes:

> Vinicius Monego (19):
>   gnu: Add python-click-repl.
>   gnu: Add python-click-didyoumean.
>   gnu: Add python-pytest-subtests.
>   gnu: python-aws-sam-translator: Update to 1.38.0.
>   gnu: python-aws-sam-translator: Change source for tests.
>   gnu: python-cfn-lint: Update to 0.53.0.
>   gnu: python-cfn-lint: Respect #:tests?.
>   gnu: python-moto: Update to 2.2.2.
>   gnu: python-moto: Respect #:tests?.
>   gnu: python-vine: Update to 5.0.0.
>   gnu: Add python-pytest-rerunfailures.
>   gnu: python-amqp: Update to 5.0.6.
>   gnu: python-kombu: Update to 5.1.0.
>   gnu: Add python-pytest-celery.
>   gnu: python-celery: Update to 5.1.2.
>   gnu: python-celery: Enable tests.
>   gnu: Remove python2-celery.
>   gnu: Remove python2-kombu.
>   gnu: Remove python2-amqp.

I applied v4 of this patch set. Thanks.

Regards,
-- 
Nicolas Goaziou

[bug#50018] [PATCH 00/19] Update Celery to version 5.

[Leo Famulari]

On Mon, Dec 27, 2021 at 12:10:46AM +0100, Nicolas Goaziou wrote:
> Vinicius Monego <monego@posteo.net> writes:
[...]
> >   gnu: Add python-pytest-rerunfailures.
> 
> I applied v4 of this patch set. Thanks.

We already had this package, so I reverted the commit.