IndicoDataSolutions · sihrc · Dec 23, 2020 · Sep 3, 2020 · Sep 3, 2020 · Sep 5, 2020
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.0.0rc2
+current_version = 5.0.5
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<releaselevel>[a-z\d]+)?

diff --git a/.coveragerc b/.coveragerc
@@ -12,7 +12,6 @@ omit =
     */celery/bin/graph.py
     *celery/bin/logtool.py
     *celery/task/base.py
-    *celery/five.py
     *celery/contrib/sphinx.py
     *celery/concurrency/asynpool.py
     *celery/utils/debug.py

diff --git a/.travis.yml b/.travis.yml
@@ -5,22 +5,32 @@ python:
   - '3.6'
   - '3.7'
   - '3.8'
+  - '3.9'
 os:
     - linux
 stages:
   - test
   - integration
   - lint
+services:
+  - redis
+  - docker
 env:
   global:
   - PYTHONUNBUFFERED=yes
   - CELERY_TOX_PARALLEL=
-  matrix:
+  jobs:
   - MATRIX_TOXENV=unit
 
-matrix:
+jobs:
   fast_finish: true
+  allow_failures:
+  - python: '3.9'
   include:
+  - python: '3.9'
+    env: MATRIX_TOXENV=integration-rabbitmq
+    stage: integration
+
   - python: 3.8
     env: MATRIX_TOXENV=integration-rabbitmq
     stage: integration
@@ -49,14 +59,14 @@ matrix:
     env: MATRIX_TOXENV=integration-elasticsearch
     stage: integration
 
-  - python: '3.8'
+  - python: '3.9'
     env:
       - TOXENV=flake8,apicheck,configcheck,bandit
       - CELERY_TOX_PARALLEL='--parallel --parallel-live'
     stage: lint
+
   - python: pypy3.6-7.3.1
-    env: TOXENV=pypy3
-    before_install: sudo apt-get update && sudo apt-get install libgnutls-dev
+    env: TOXENV=pypy3-unit
     stage: test
 
 before_install:
@@ -113,21 +123,18 @@ before_install:
           wget -qO - https://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
           sudo apt-add-repository -y 'deb http://packages.couchbase.com/ubuntu bionic bionic/main'
           sudo apt-get update && sudo apt-get install -y libcouchbase-dev
+install: pip --disable-pip-version-check install --upgrade-strategy eager -U tox | cat
+script: tox $CELERY_TOX_PARALLEL -v -- -v
 after_success:
   - |
           if [[ -v MATRIX_TOXENV || "$TOXENV" =~ "pypy" ]]; then
               .tox/$TOXENV/bin/coverage xml
               .tox/$TOXENV/bin/codecov -e TOXENV
           fi;
-install: pip --disable-pip-version-check install --upgrade-strategy eager -U tox | cat
-script: tox $CELERY_TOX_PARALLEL -v -- -v
 notifications:
   email: false
   irc:
     channels:
       - "chat.freenode.net#celery"
     on_success: change
     on_failure: change
-services:
-    - redis
-    - docker
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": false
+}
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -40,7 +40,7 @@ The Code of Conduct is heavily based on the `Ubuntu Code of Conduct`_, and
 the `Pylons Code of Conduct`_.
 
 .. _`Ubuntu Code of Conduct`: https://www.ubuntu.com/community/conduct
-.. _`Pylons Code of Conduct`: http://docs.pylonshq.com/community/conduct.html
+.. _`Pylons Code of Conduct`: https://pylonsproject.org/community-code-of-conduct.html
 
 Be considerate
 --------------
@@ -447,7 +447,7 @@ fetch and checkout a remote branch like this::
 
 .. _`Fork a Repo`: https://help.github.com/fork-a-repo/
 .. _`Rebasing merge commits in git`:
-    https://notes.envato.com/developers/rebasing-merge-commits-in-git/
+    https://web.archive.org/web/20150627054345/http://marketblog.envato.com/general/rebasing-merge-commits-in-git/
 .. _`Rebase`: https://help.github.com/rebase/
 
 .. _contributing-docker-development:
@@ -592,14 +592,14 @@ To run the Celery test suite you need to install
     $ pip install -U -r requirements/default.txt
 
 After installing the dependencies required, you can now execute
-the test suite by calling :pypi:`py.test <pytest>`:
+the test suite by calling :pypi:`pytest <pytest>`:
 
 .. code-block:: console
 
-    $ py.test t/unit
-    $ py.test t/integration
+    $ pytest t/unit
+    $ pytest t/integration
 
-Some useful options to :command:`py.test` are:
+Some useful options to :command:`pytest` are:
 
 * ``-x``
 
@@ -618,7 +618,7 @@ you can do so like this:
 
 .. code-block:: console
 
-    $ py.test t/unit/worker/test_worker.py
+    $ pytest t/unit/worker/test_worker.py
 
 .. _contributing-coverage:
 
@@ -636,11 +636,11 @@ Installing the :pypi:`pytest-cov` module:
 Code coverage in HTML format
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-#. Run :command:`py.test` with the ``--cov-report=html`` argument enabled:
+#. Run :command:`pytest` with the ``--cov-report=html`` argument enabled:
 
     .. code-block:: console
 
-        $ py.test --cov=celery --cov-report=html
+        $ pytest --cov=celery --cov-report=html
 
 #. The coverage output will then be located in the :file:`htmlcov/` directory:
 
@@ -651,11 +651,11 @@ Code coverage in HTML format
 Code coverage in XML (Cobertura-style)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-#. Run :command:`py.test` with the ``--cov-report=xml`` argument enabled:
+#. Run :command:`pytest` with the ``--cov-report=xml`` argument enabled:
 
 .. code-block:: console
 
-    $ py.test --cov=celery --cov-report=xml
+    $ pytest --cov=celery --cov-report=xml
 
 #. The coverage XML output will then be located in the :file:`coverage.xml` file.
 
@@ -828,7 +828,7 @@ make it easier for the maintainers to accept your proposed changes:
       ``Needs Test Coverage``.
 
 - [ ] Make sure unit test coverage does not decrease.
-      ``py.test -xv --cov=celery --cov-report=xml --cov-report term``.
+      ``pytest -xv --cov=celery --cov-report=xml --cov-report term``.
       You can check the current test coverage here: https://codecov.io/gh/celery/celery
 
 - [ ] Run ``flake8`` against the code. The following commands are valid
@@ -1067,7 +1067,6 @@ is following the conventions.
         from Queue import Queue, Empty
 
         from .platforms import Pidfile
-        from .five import zip_longest, items, range
         from .utils.time import maybe_timedelta
 
 * Wild-card imports must not be used (`from xxx import *`).

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -277,3 +277,5 @@ Kyle Johnson, 2019/09/23
 Dipankar Achinta, 2019/10/24
 Sardorbek Imomaliev, 2020/01/24
 Maksym Shalenyi, 2020/07/30
+Frazer McLean, 2020/09/29
+Henrik Bruåsdal, 2020/11/29
diff --git a/Changelog.rst b/Changelog.rst
@@ -8,12 +8,113 @@ This document contains change notes for bugfix & new features
 in the 5.0.x series, please see :ref:`whatsnew-5.0` for
 an overview of what's new in Celery 5.0.
 
+.. _version-5.0.5:
+
+5.0.5
+=====
+:release-date: 2020-12-16 5.35 P.M UTC+2:00
+:release-by: Omer Katz
+
+- Ensure keys are strings when deleting results from S3 (#6537).
+- Fix a regression breaking `celery --help` and `celery events` (#6543).
+
+.. _version-5.0.4:
+
+5.0.4
+=====
+:release-date: 2020-12-08 2.40 P.M UTC+2:00
+:release-by: Omer Katz
+
+-  DummyClient of cache+memory:// backend now shares state between threads (#6524).
+
+   This fixes a problem when using our pytest integration with the in memory
+   result backend.
+   Because the state wasn't shared between threads, #6416 results in test suites
+   hanging on `result.get()`.
+
+.. _version-5.0.3:
+
+5.0.3
+=====
+:release-date: 2020-12-03 6.30 P.M UTC+2:00
+:release-by: Omer Katz
+
+- Make `--workdir` eager for early handling (#6457).
+- When using the MongoDB backend, don't cleanup if result_expires is 0 or None (#6462).
+- Fix passing queues into purge command (#6469).
+- Restore `app.start()` and `app.worker_main()` (#6481).
+- Detaching no longer creates an extra log file (#6426).
+- Result backend instances are now thread local to ensure thread safety (#6416).
+- Don't upgrade click to 8.x since click-repl doesn't support it yet.
+- Restore preload options (#6516).
+
+.. _version-5.0.2:
+
+5.0.2
+=====
+:release-date: 2020-11-02 8.00 P.M UTC+2:00
+:release-by: Omer Katz
+
+- 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)
+
+.. _version-5.0.1:
+
+5.0.1
+=====
+:release-date: 2020-10-18 1.00 P.M UTC+3:00
+:release-by: Omer Katz
+
+- 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).
+
+.. _version-5.0.0:
 
 5.0.0
 =====
-:release-date: N/A
+:release-date: 2020-09-24 6.00 P.M UTC+3:00
+:release-by: Omer Katz
+
+- **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).
+
+5.0.0rc3
+========
+:release-date: 2020-09-07 4.00 P.M UTC+3:00
 :release-by: Omer Katz
 
+- More cleanups of leftover Python 2 support (#6338).
+
 5.0.0rc2
 ========
 :release-date: 2020-09-01 6.30 P.M UTC+3:00
@@ -29,17 +130,17 @@ an overview of what's new in Celery 5.0.
 :release-by: Omer Katz
 
 - Allow to opt out of ordered group results when using the Redis result backend (#6290).
-- **Breaking Chnage** Remove the deprecated celery.utils.encoding module.
+- **Breaking Change** Remove the deprecated celery.utils.encoding module.
 
 5.0.0b1
 =======
 :release-date: 2020-08-19 8.30 P.M UTC+3:00
 :release-by: Omer Katz
 
-- **Breaking Chnage** Drop support for the Riak result backend (#5686).
-- **Breaking Chnage** pytest plugin is no longer enabled by default. (#6288)
+- **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 Chnage** Brand new CLI based on Click (#5718).
+- **Breaking Change** Brand new CLI based on Click (#5718).
 
 5.0.0a2
 =======

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 PROJ=celery
 PGPIDENT="Celery Security Team"
 PYTHON=python
-PYTEST=py.test
+PYTEST=pytest
 GIT=git
 TOX=tox
 ICONV=iconv