diff --git a/disable-pytest-log-capturing.patch b/disable-pytest-log-capturing.patch new file mode 100644 index 0000000..99a952e --- /dev/null +++ b/disable-pytest-log-capturing.patch @@ -0,0 +1,21 @@ +From: Michael Fladischer +Date: Wed, 28 Mar 2018 21:08:22 +0200 +Subject: Disable pytest (>=3.3) log capturing to avoid changing log handlers + (Closes: #892640). + +--- + setup.cfg | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.cfg b/setup.cfg +index 1a3f0b4..9f836e1 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,6 +1,7 @@ + [tool:pytest] + testpaths = t/unit/ + python_classes = test_* ++addopts=-p no:logging + + [build_sphinx] + source-dir = docs/ diff --git a/python-celery.spec b/python-celery.spec index 70f0f72..58d4582 100644 --- a/python-celery.spec +++ b/python-celery.spec @@ -1,7 +1,7 @@ # # spec file for package python-celery # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,8 +23,9 @@ Release: 0 Summary: Distributed Task Queue module for Python License: BSD-3-Clause Group: Development/Languages/Python -Url: http://celeryproject.org +URL: http://celeryproject.org Source: https://files.pythonhosted.org/packages/source/c/celery/celery-%{version}.tar.gz +Patch0: disable-pytest-log-capturing.patch BuildRequires: %{python_module SQLAlchemy} BuildRequires: %{python_module billiard >= 3.5.0.2} BuildRequires: %{python_module case >= 1.3.1} @@ -53,7 +54,6 @@ Suggests: python-gevent Suggests: python-pymongo Suggests: python-python-daemon Suggests: python-pytyrant -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -64,6 +64,7 @@ scheduling as well. %prep %setup -q -n celery-%{version} +%patch0 -p1 %build %python_build @@ -76,9 +77,9 @@ scheduling as well. python setup.py -q test %files %{python_files} -%defattr(-,root,root,-) %{python_sitelib}/* -%doc Changelog README.rst TODO LICENSE +%license LICENSE +%doc Changelog README.rst TODO %python3_only %{_bindir}/celery* %changelog