From d5deacc1c92b9be8512159e229a04d4660b5295b016d047be450167d4591a17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 31 Jul 2019 09:55:32 +0000 Subject: [PATCH] - Add patch from git to fix build with new pytest: * pytest5.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-celery?expand=0&rev=122 --- pytest5.patch | 22 ++++++++++++++++++++++ python-celery.changes | 6 ++++++ python-celery.spec | 1 + 3 files changed, 29 insertions(+) create mode 100644 pytest5.patch diff --git a/pytest5.patch b/pytest5.patch new file mode 100644 index 0000000..0631d09 --- /dev/null +++ b/pytest5.patch @@ -0,0 +1,22 @@ +From 6514fed13ef2f992b2846116f9b2d1237aac8298 Mon Sep 17 00:00:00 2001 +From: Omer Katz +Date: Mon, 20 May 2019 13:02:34 +0300 +Subject: [PATCH] Fix pytest deprecation warning. + +--- + t/unit/tasks/test_result.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/unit/tasks/test_result.py b/t/unit/tasks/test_result.py +index 0fe173ed2f..fed76c8fed 100644 +--- a/t/unit/tasks/test_result.py ++++ b/t/unit/tasks/test_result.py +@@ -759,7 +759,7 @@ def test_restore_current_app_fallback(self): + ts = self.app.GroupResult(uuid(), subs) + ts.save() + with pytest.raises(RuntimeError, +- message="Test depends on current_app"): ++ match="Test depends on current_app"): + GroupResult.restore(ts.id) + + def test_join_native(self): diff --git a/python-celery.changes b/python-celery.changes index 6977167..c84a87d 100644 --- a/python-celery.changes +++ b/python-celery.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 31 09:55:16 UTC 2019 - Tomáš Chvátal + +- Add patch from git to fix build with new pytest: + * pytest5.patch + ------------------------------------------------------------------- Wed Jul 24 11:12:29 UTC 2019 - Tomáš Chvátal diff --git a/python-celery.spec b/python-celery.spec index 5e16a0f..92cff35 100644 --- a/python-celery.spec +++ b/python-celery.spec @@ -34,6 +34,7 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: http://celeryproject.org Source: https://files.pythonhosted.org/packages/source/c/celery/celery-%{version}.tar.gz +Patch0: pytest5.patch Patch2: unpin-pytest.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes