diff --git a/celery-4.4.7.tar.gz b/celery-4.4.7.tar.gz deleted file mode 100644 index a6790d0..0000000 --- a/celery-4.4.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f -size 1469812 diff --git a/celery-5.0.2.tar.gz b/celery-5.0.2.tar.gz new file mode 100644 index 0000000..2b55ccc --- /dev/null +++ b/celery-5.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:012c814967fe89e3f5d2cf49df2dba3de5f29253a7f4f2270e8fce6b901b4ebf +size 1425617 diff --git a/move-pytest-configuration-to-conftest.patch b/move-pytest-configuration-to-conftest.patch new file mode 100644 index 0000000..b9b4569 --- /dev/null +++ b/move-pytest-configuration-to-conftest.patch @@ -0,0 +1,42 @@ +Index: celery-5.0.2/celery/contrib/pytest.py +=================================================================== +--- celery-5.0.2.orig/celery/contrib/pytest.py ++++ celery-5.0.2/celery/contrib/pytest.py +@@ -13,16 +13,6 @@ NO_WORKER = os.environ.get('NO_WORKER') + # Well, they're called fixtures.... + + +-def pytest_configure(config): +- """Register additional pytest configuration.""" +- # add the pytest.mark.celery() marker registration to the pytest.ini [markers] section +- # this prevents pytest 4.5 and newer from issueing a warning about an unknown marker +- # and shows helpful marker documentation when running pytest --markers. +- config.addinivalue_line( +- "markers", "celery(**overrides): override celery configuration for a test case" +- ) +- +- + @contextmanager + def _create_app(enable_logging=False, + use_trap=False, +Index: celery-5.0.2/t/unit/conftest.py +=================================================================== +--- celery-5.0.2.orig/t/unit/conftest.py ++++ celery-5.0.2/t/unit/conftest.py +@@ -40,6 +40,16 @@ CASE_LOG_LEVEL_EFFECT = 'Test {0} modifi + CASE_LOG_HANDLER_EFFECT = 'Test {0} modified handlers for the root logger' + + ++def pytest_configure(config): ++ """Register additional pytest configuration.""" ++ # add the pytest.mark.celery() marker registration to the pytest.ini [markers] section ++ # this prevents pytest 4.5 and newer from issueing a warning about an unknown marker ++ # and shows helpful marker documentation when running pytest --markers. ++ config.addinivalue_line( ++ "markers", "celery(**overrides): override celery configuration for a test case" ++ ) ++ ++ + @pytest.fixture(scope='session') + def celery_config(): + return { diff --git a/python-celery.changes b/python-celery.changes index d45c57e..79fbe22 100644 --- a/python-celery.changes +++ b/python-celery.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Nov 17 04:14:43 UTC 2020 - Steve Kowalik + +- Update to 5.02: + * Fix _autodiscover_tasks_from_fixups (#6424). + * Flush worker prints, notably the banner (#6432). + * Breaking Change: Remove ha_policy from queue definition. (#6440) + * This argument has no effect since RabbitMQ 3.0. Therefore, We feel + comfortable dropping it in a patch release. + * Python 3.9 support (#6418). + * Regression: When using the prefork pool, pick the fair scheduling strategy + by default (#6447). + * Preserve callbacks when replacing a task with a chain (#6189). + * Fix max_retries override on self.retry() (#6436). + * Raise proper error when replacing with an empty chain (#6452) + * Specify UTF-8 as the encoding for log files (#6357). + * Custom headers now propagate when using the protocol 1 hybrid messages + (#6374). + * Retry creating the database schema for the database results backend in case of a race condition (#6298). + * When using the Redis results backend, awaiting for a chord no longer hangs + when setting :setting:`result_expires` to 0 (#6373). + * When a user tries to specify the app as an option for the subcommand, a + custom error message is displayed (#6363). + * Fix the --without-gossip, --without-mingle, and --without-heartbeat options + which now work as expected. (#6365) + * Provide a clearer error message when the application cannot be loaded. + * Avoid printing deprecation warnings for settings when they are loaded from + Django settings (#6385). + * Allow lowercase log levels for the --loglevel option (#6388). + * Detaching now works as expected (#6401). + * Restore broadcasting messages from celery control (#6400). + * Pass back real result for single task chains (#6411). + * Ensure group tasks a deeply serialized (#6342). + * Fix chord element counting (#6354). + * Restore the celery shell command (#6421). + * Breaking Change Remove AMQP result backend (#6360). + * Warn when deprecated settings are used (#6353). + * Expose retry_policy for Redis result backend (#6330). + * Prepare Celery to support the yet to be released Python 3.9 (#6328). + * More cleanups of leftover Python 2 support (#6338). + * Bump minimum required eventlet version to 0.26.1. + * Update Couchbase Result backend to use SDK V3. + * Restore monkeypatching when gevent or eventlet are used. + * Allow to opt out of ordered group results when using the Redis result + backend (#6290). + * Breaking Change Remove the deprecated celery.utils.encoding module. + * Breaking Change Drop support for the Riak result backend (#5686). + * Breaking Change pytest plugin is no longer enabled by default (#6288). + Install pytest-celery to enable it. + * Breaking Change Brand new CLI based on Click (#5718). + * Bump Kombu version to 5.0 (#5686). + * Removed most of the compatibility code that supports Python 2 (#5686). + * Modernized code to work on Python 3.6 and above (#5686). +- Update BuildRequires/Requires. +- Add patch move-pytest-configuration-to-conftest.patch to fix testsuite. + ------------------------------------------------------------------- Wed Sep 30 07:32:47 UTC 2020 - Tomáš Chvátal diff --git a/python-celery.spec b/python-celery.spec index ad2ef49..fc5d3c6 100644 --- a/python-celery.spec +++ b/python-celery.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -26,23 +27,25 @@ %bcond_with test %endif %bcond_with ringdisabled -%bcond_without python2 Name: python-celery%{psuffix} -Version: 4.4.7 +Version: 5.0.2 Release: 0 Summary: Distributed Task Queue module for Python License: BSD-3-Clause URL: http://celeryproject.org Source: https://files.pythonhosted.org/packages/source/c/celery/celery-%{version}.tar.gz +Patch0: move-pytest-configuration-to-conftest.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: netcfg BuildRequires: python-rpm-macros Requires: python-billiard >= 3.6.3.0 -Requires: python-future >= 0.18.0 -Requires: python-kombu >= 4.6.10 +Requires: python-click => 7.0 +Requires: python-click-didyoumean >= 0.0.3 +Requires: python-click-repl >= 0.1.6 +Requires: python-kombu >= 5.0.0 Requires: python-pytz >= 2016.7 -Requires: python-vine >= 1.3.0 +Requires: python-vine >= 5.0.0 Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: python-curses @@ -59,19 +62,16 @@ BuildRequires: %{python_module billiard >= 3.6.3.0} BuildRequires: %{python_module boto3 >= 1.9.178} BuildRequires: %{python_module case >= 1.3.1} BuildRequires: %{python_module cryptography} -BuildRequires: %{python_module eventlet >= 0.24.1} -BuildRequires: %{python_module future >= 0.18.0} +BuildRequires: %{python_module eventlet >= 0.26.1} BuildRequires: %{python_module gevent} -BuildRequires: %{python_module kombu >= 4.6.10} +BuildRequires: %{python_module kombu >= 5.0.0} BuildRequires: %{python_module moto >= 1.3.7} BuildRequires: %{python_module msgpack} BuildRequires: %{python_module pymongo >= 3.3.0} BuildRequires: %{python_module pytest >= 4.5.0} +BuildRequires: %{python_module pytest-subtests} BuildRequires: %{python_module pytz >= 2016.7} -BuildRequires: %{python_module vine >= 1.3.0} -%if %{with python2} -BuildRequires: %{python_module python-dateutil >= 2.1} -%endif +BuildRequires: %{python_module vine >= 5.0.0} %if %{with ringdisabled} ExclusiveArch: do-not-build %endif @@ -85,6 +85,7 @@ scheduling as well. %prep %setup -q -n celery-%{version} +%autopatch -p1 # do not hardcode versions sed -i -e 's:==:>=:g' requirements/*.txt