[arch-commits] Commit in python-celery/trunk (PKGBUILD python-3.8.patch)

[Felix Yan]

    Date: Saturday, March 14, 2020 @ 21:34:48
  Author: felixonmars
Revision: 597293

upgpkg: python-celery 4.4.1-1

Modified:
  python-celery/trunk/PKGBUILD
Deleted:
  python-celery/trunk/python-3.8.patch

------------------+
 PKGBUILD         |   39 ++++++++++++++++-----------------------
 python-3.8.patch |   22 ----------------------
 2 files changed, 16 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-14 21:34:07 UTC (rev 597292)
+++ PKGBUILD	2020-03-14 21:34:48 UTC (rev 597293)
@@ -6,48 +6,40 @@
 # Contributor: apkawa <apkawa at gmail.com>
 
 pkgname=python-celery
-pkgver=4.3.0
-pkgrel=4
+pkgver=4.4.1
+pkgrel=1
 pkgdesc='Distributed Asynchronous Task Queue'
 arch=('any')
 url='http://celeryproject.org/'
 license=('BSD')
-depends=('python-kombu' 'python-billiard' 'python-pytz')
-optdepends=('python-pyopenssl: for celery.security'
+depends=('python-kombu' 'python-billiard' 'python-pytz' 'python-vine')
+optdepends=('python-cryptography: for celery.security'
             'python-pymongo: for celery.backends.mongodb'
             'python-msgpack: for using the msgpack serializer'
             'python-pyro: for using Pyro4 message transport'
             'python-redis: for celery.backends.redis'
             'python-sqlalchemy: for celery.backends.database'
-            'python-boto: for SQS transport'
+            'python-boto3: for SQS transport'
             'python-yaml: for using the yaml serializer'
             'python-pyzmq: for using ZeroMQ transport')
 makedepends=('python-setuptools')
-checkdepends=('python-pytest' 'python-pytest-runner' 'python-case' 'python-pyopenssl'
+checkdepends=('python-pytest' 'python-pytest-runner' 'python-case' 'python-cryptography'
               'python-gevent' 'python-pymongo' 'python-msgpack' 'python-pyro' 'python-redis'
-              'python-sqlalchemy' 'python-boto' 'python-yaml' 'python-pyzmq' 'python-eventlet'
-              'python-moto')
+              'python-sqlalchemy' 'python-boto3' 'python-yaml' 'python-pyzmq' 'python-eventlet'
+              'python-moto' 'python-pre-commit')
 source=("https://pypi.io/packages/source/c/celery/celery-$pkgver.tar.gz"
-        https://github.com/celery/celery/commit/89c4573ac47a1f840ed2d15e2820d0eaed29dc32.patch
-        https://github.com/celery/celery/commit/6514fed13ef2f992b2846116f9b2d1237aac8298.patch
-        python-3.8.patch
         celery at .service celery.tmpfiles.d)
 options=('!emptydirs')
-sha512sums=('91dd16bd6c9544c76d84e468872e052bdf5e1737980a1a3baee914c75c88db44b9ac8de7ddc4278988ca6cb159496b6560cecd6bb51d6352725009e97d268afb'
-            '691ae1b4bf98317f6bea2d2ae26cd770c5a5242ae6b41d8d5cd0ea0ce3d521d5f3b16a1b1f33429bd777f7f628c84e29a5bada37ecb33e73c0118f9c1f992a12'
-            '6c3e6da14c57cad5e26a34c5d5f59977938fbb93ae04b97b88427ca3c67b1f0ff8cf4bbfb42394ac2a6714cf847527275f99a45f6e34fb260686bb80b80d7cc4'
-            '5ad6589684cea159deeb8ca60c1247e24d6cd955b01e36c6a374702166845763b24f8212b18106e2a3b02f5a0012699c1fff78a3a65147376cc45a5f915a48ff'
+sha512sums=('91b0b4a5b6536665f73ccda09e8efa170f022e0201dcc615b45d4dcc68d486fe2485a717cb670fbc3f633721f6d3ff551f8f9fc3f1c605b4d7292cb0c1a5831d'
             '3c6c9dbdacca2de12d49c03526b34797fd867c14d04115af0d1fda64d2848a5d3f64ceb6d284be319a81d932dc86e69c157b6f5f859f2fa213fc2f43a6052c65'
             '67279b75c3b44d065811c9c90aee006296164000912d5bb97c74956b26ee4ad4f0847e846052a896d379848b869c849300367e676d3f689cf29e3a0c7ae5310b')
 
 prepare() {
-  # Fix a test for Python 3.8
-  patch -d celery-$pkgver -p1 -i ../python-3.8.patch
-  # Fix for new pymongo
-  patch -d celery-$pkgver -p1 -i ../89c4573ac47a1f840ed2d15e2820d0eaed29dc32.patch
-  # Fix for new pytest
-  patch -d celery-$pkgver -p1 -i ../6514fed13ef2f992b2846116f9b2d1237aac8298.patch
-  sed -i -e 's/==/>=/' -e 's/< *4.4/<6/' celery-$pkgver/requirements/test.txt
+  cd celery-$pkgver
+  sed -i -e 's/==/>=/' requirements/test.txt
+
+  sed -i -e '/from pytest import PytestUnknownMarkWarning/a \    from _pytest.outcomes import Failed' \
+         -e 's/ValueError/Failed/' t/unit/contrib/test_pytest.py
 }
 
 build() {
@@ -57,7 +49,8 @@
 
 check() {
   cd celery-$pkgver
-  python setup.py pytest
+  # TODO
+  python setup.py pytest --addopts "--deselect t/unit/security/test_security.py::test_security::test_setup_security__default_app"
 }
 
 package() {

Deleted: python-3.8.patch
===================================================================
--- python-3.8.patch	2020-03-14 21:34:07 UTC (rev 597292)
+++ python-3.8.patch	2020-03-14 21:34:48 UTC (rev 597293)
@@ -1,22 +0,0 @@
-From 340ef9d973ffd533b17548e3a9f50418501b0681 Mon Sep 17 00:00:00 2001
-From: Omer Katz <omer.drow at gmail.com>
-Date: Mon, 28 Oct 2019 20:57:59 +0200
-Subject: [PATCH] Add Python 3.8 Support (#5785)
-
-* Workaround patching problem in test.
-
-diff --git a/celery/contrib/testing/app.py b/celery/contrib/testing/app.py
-index 3580c43165..60c6462135 100644
---- a/celery/contrib/testing/app.py
-+++ b/celery/contrib/testing/app.py
-@@ -30,6 +30,10 @@ class Trap(object):
-     """
- 
-     def __getattr__(self, name):
-+        # Workaround to allow unittest.mock to patch this object
-+        # in Python 3.8 and above.
-+        if name == '_is_coroutine':
-+            return None
-         raise RuntimeError('Test depends on current_app')
- 
-