From b5efc563453a930f141b4512882858d603c3e10e764cbbfe1f4c498f9d5e7a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 16 Aug 2018 11:11:59 +0000
Subject: [PATCH] - Update to 4.2.1:   * Fix to build with newest kombu   *
 Many bugfixes around - Add patch to skip test that should not be run:   *
 celery-no-redis.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-celery?expand=0&rev=105
---
 celery-4.1.0.tar.gz   |  3 ---
 celery-4.2.1.tar.gz   |  3 +++
 celery-no-redis.patch | 26 ++++++++++++++++++++++++++
 python-celery.changes |  9 +++++++++
 python-celery.spec    |  8 +++++---
 5 files changed, 43 insertions(+), 6 deletions(-)
 delete mode 100644 celery-4.1.0.tar.gz
 create mode 100644 celery-4.2.1.tar.gz
 create mode 100644 celery-no-redis.patch

diff --git a/celery-4.1.0.tar.gz b/celery-4.1.0.tar.gz
deleted file mode 100644
index bcb8060..0000000
--- a/celery-4.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77ff3730198d6a17b3c1f05579ebe570b579efb35f6d7e13dba3b1368d068b35
-size 1331689
diff --git a/celery-4.2.1.tar.gz b/celery-4.2.1.tar.gz
new file mode 100644
index 0000000..2fee338
--- /dev/null
+++ b/celery-4.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77dab4677e24dc654d42dfbdfed65fa760455b6bb563a0877ecc35f4cfcfc678
+size 1364075
diff --git a/celery-no-redis.patch b/celery-no-redis.patch
new file mode 100644
index 0000000..f568c8c
--- /dev/null
+++ b/celery-no-redis.patch
@@ -0,0 +1,26 @@
+From b2668607c909c61becd151905b4525190c19ff4a Mon Sep 17 00:00:00 2001
+From: Jon Dufresne <jon.dufresne@gmail.com>
+Date: Sat, 23 Jun 2018 16:08:47 -0700
+Subject: [PATCH] Require the redis module for test
+ test_timeouts_in_url_coerced (#4847)
+
+The test requires the redis module to be installed. It is referenced in
+the function RedisBackend._params_from_url().
+
+Fixes AppVeyor build failures.
+---
+ t/unit/backends/test_redis.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/t/unit/backends/test_redis.py b/t/unit/backends/test_redis.py
+index ee2ecf7959..166aa0dc34 100644
+--- a/t/unit/backends/test_redis.py
++++ b/t/unit/backends/test_redis.py
+@@ -234,6 +234,7 @@ def test_url(self):
+         assert x.connparams['socket_timeout'] == 30.0
+         assert x.connparams['socket_connect_timeout'] == 100.0
+ 
++    @skip.unless_module('redis')
+     def test_timeouts_in_url_coerced(self):
+         x = self.Backend(
+             ('redis://:bosco@vandelay.com:123//1?'
diff --git a/python-celery.changes b/python-celery.changes
index 960764b..9851ef4 100644
--- a/python-celery.changes
+++ b/python-celery.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 16 11:04:24 UTC 2018 - tchvatal@suse.com
+
+- Update to 4.2.1:
+  * Fix to build with newest kombu
+  * Many bugfixes around
+- Add patch to skip test that should not be run:
+  * celery-no-redis.patch
+
 -------------------------------------------------------------------
 Wed May  2 08:47:12 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-celery.spec b/python-celery.spec
index 58d4582..77a73c2 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -18,7 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-celery
-Version:        4.1.0
+Version:        4.2.1
 Release:        0
 Summary:        Distributed Task Queue module for Python
 License:        BSD-3-Clause
@@ -26,6 +26,7 @@ Group:          Development/Languages/Python
 URL:            http://celeryproject.org
 Source:         https://files.pythonhosted.org/packages/source/c/celery/celery-%{version}.tar.gz
 Patch0:         disable-pytest-log-capturing.patch
+Patch1:         celery-no-redis.patch
 BuildRequires:  %{python_module SQLAlchemy}
 BuildRequires:  %{python_module billiard >= 3.5.0.2}
 BuildRequires:  %{python_module case >= 1.3.1}
@@ -64,7 +65,8 @@ scheduling as well.
 
 %prep
 %setup -q -n celery-%{version}
-%patch0 -p1
+%autopatch -p1
+sed -i -e 's:,<3.3::g' requirements/test.txt
 
 %build
 %python_build
@@ -74,7 +76,7 @@ scheduling as well.
 %fdupes %{buildroot}/%{_prefix}
 
 %check
-python setup.py -q test
+%python_exec setup.py test
 
 %files %{python_files}
 %{python_sitelib}/*