Skip to content

Commit 9170aae

Browse files
committed
Upgrade-celery to 4.2.2
1 parent b1b3021 commit 9170aae

File tree

13 files changed

+87
-77
lines changed

13 files changed

+87
-77
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ Change Log
1313
1414
Unreleased
1515
~~~~~~~~~~
16-
1716
*
1817

18+
[0.5.2] - 2020-08-28
19+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20+
* Upgrade celery to 4.2.2
21+
1922
[0.5.1] - 2020-06-30
2023
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2124

celery_utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
Code to support working with celery.
33
"""
44

5-
__version__ = '0.5.1'
5+
__version__ = '0.5.2'
66

77
default_app_config = 'celery_utils.apps.CeleryUtilsConfig' # pylint: disable=invalid-name

celery_utils/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ def mark_resolved(task_id):
1515
If more than one record exists with the specified task id, they will all be
1616
marked resolved.
1717
"""
18-
from . import models
18+
from . import models # pylint: disable=import-outside-toplevel
1919
models.FailedTask.objects.filter(task_id=task_id, datetime_resolved=None).update(datetime_resolved=now())

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-c constraints.txt
44

55
future
6-
celery>= 3.1.25,<4.0
6+
celery
77
Django >= 1.11 , <2.3
88
django-model-utils
99
jsonfield2

requirements/base.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
#
55
# make upgrade
66
#
7-
amqp==1.4.9 # via kombu
8-
anyjson==0.3.3 # via kombu
9-
billiard==3.3.0.23 # via celery
10-
celery==3.1.26.post2 # via -r requirements/base.in
7+
amqp==2.6.1 # via kombu
8+
billiard==3.5.0.5 # via celery
9+
celery==4.2.2 # via -c requirements/constraints.txt, -r requirements/base.in
1110
django-model-utils==4.0.0 # via -r requirements/base.in
12-
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, jsonfield2
11+
django==2.2.15 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, jsonfield2
1312
future==0.18.2 # via -r requirements/base.in
1413
jsonfield2==3.0.3 # via -c requirements/constraints.txt, -r requirements/base.in
15-
kombu==3.0.37 # via celery
14+
kombu==4.3.0 # via celery
1615
pytz==2020.1 # via celery, django
1716
sqlparse==0.3.1 # via django
17+
vine==1.3.0 # via amqp

requirements/constraints.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
django<2.3
1313

1414
# jsonfield2>3.0.3 has dropped support for python 3.5
15-
jsonfield2==3.0.3
15+
jsonfield2==3.0.3
16+
17+
celery<4.3 # Python 3.8 isn't officially supported until 4.4 and 4.3 requires redis version 3.2.0 or above.

requirements/dev.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
appdirs==1.4.4 # via virtualenv
88
astroid==2.3.3 # via pylint, pylint-celery
99
bleach==3.1.5 # via readme-renderer
10-
certifi==2020.4.5.1 # via requests
10+
certifi==2020.6.20 # via requests
1111
chardet==3.0.4 # via requests
1212
click-log==0.3.2 # via edx-lint
1313
click==7.1.2 # via click-log, edx-lint, pip-tools
14-
diff-cover==2.6.1 # via -r requirements/dev.in
15-
distlib==0.3.0 # via virtualenv
16-
django==2.2.12 # via -c requirements/constraints.txt, edx-i18n-tools
14+
diff-cover==3.0.1 # via -r requirements/dev.in
15+
distlib==0.3.1 # via virtualenv
16+
django==2.2.15 # via -c requirements/constraints.txt, edx-i18n-tools
1717
docutils==0.16 # via readme-renderer
1818
edx-i18n-tools==0.5.3 # via -r requirements/dev.in
19-
edx-lint==1.4.1 # via -r requirements/dev.in, -r requirements/quality.in
19+
edx-lint==1.5.2 # via -r requirements/dev.in, -r requirements/quality.in
2020
filelock==3.0.12 # via tox, virtualenv
21-
idna==2.9 # via requests
22-
importlib-metadata==1.6.0 # via importlib-resources, inflect, path, pluggy, tox, virtualenv
23-
importlib-resources==1.5.0 # via virtualenv
21+
idna==2.10 # via requests
22+
importlib-metadata==1.7.0 # via inflect, path, pluggy, tox, virtualenv
23+
importlib-resources==3.0.0 # via virtualenv
2424
inflect==3.0.2 # via jinja2-pluralize
2525
isort==4.3.21 # via -r requirements/quality.in, pylint
2626
jinja2-pluralize==0.3.0 # via diff-cover
@@ -29,39 +29,39 @@ lazy-object-proxy==1.4.3 # via astroid
2929
markupsafe==1.1.1 # via jinja2
3030
mccabe==0.6.1 # via pylint
3131
packaging==20.4 # via bleach, tox
32-
path.py==12.4.0 # via edx-i18n-tools
32+
path.py==12.5.0 # via edx-i18n-tools
3333
path==13.1.0 # via path.py
34-
pip-tools==5.1.2 # via -r requirements/dev.in
34+
pip-tools==5.3.1 # via -r requirements/dev.in
3535
pkginfo==1.5.0.1 # via twine
3636
pluggy==0.13.1 # via diff-cover, tox
3737
polib==1.1.0 # via edx-i18n-tools
38-
py==1.8.1 # via tox
38+
py==1.9.0 # via tox
3939
pycodestyle==2.6.0 # via -r requirements/quality.in
4040
pydocstyle==3.0.0 # via -r requirements/quality.in
4141
pygments==2.6.1 # via diff-cover, readme-renderer
4242
pylint-celery==0.3 # via edx-lint
4343
pylint-django==2.0.11 # via edx-lint
4444
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
45-
pylint==2.4.2 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
45+
pylint==2.4.4 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
4646
pyparsing==2.4.7 # via packaging
4747
pytz==2020.1 # via django
4848
pyyaml==5.3.1 # via edx-i18n-tools
4949
readme-renderer==26.0 # via twine
5050
requests-toolbelt==0.9.1 # via twine
51-
requests==2.23.0 # via requests-toolbelt, twine
51+
requests==2.24.0 # via requests-toolbelt, twine
5252
six==1.15.0 # via astroid, bleach, diff-cover, edx-i18n-tools, edx-lint, packaging, pip-tools, pydocstyle, readme-renderer, tox, virtualenv
5353
snowballstemmer==2.0.0 # via pydocstyle
5454
sqlparse==0.3.1 # via django
5555
toml==0.10.1 # via tox
56-
tox-battery==0.6.0 # via -r requirements/dev.in
57-
tox==3.15.1 # via -r requirements/dev.in, tox-battery
58-
tqdm==4.46.0 # via twine
56+
tox-battery==0.6.1 # via -r requirements/dev.in
57+
tox==3.19.0 # via -r requirements/dev.in, tox-battery
58+
tqdm==4.48.2 # via twine
5959
twine==1.15.0 # via -r requirements/dev.in
6060
typed-ast==1.4.1 # via astroid
61-
urllib3==1.25.9 # via requests
62-
virtualenv==20.0.18 # via -c requirements/constraints.txt, tox
61+
urllib3==1.25.10 # via requests
62+
virtualenv==20.0.31 # via tox
6363
webencodings==0.5.1 # via bleach
64-
wheel==0.34.2 # via -r requirements/dev.in
64+
wheel==0.35.1 # via -r requirements/dev.in
6565
wrapt==1.11.2 # via astroid
6666
zipp==1.2.0 # via importlib-metadata, importlib-resources
6767

requirements/doc.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,37 @@
55
# make upgrade
66
#
77
alabaster==0.7.12 # via sphinx
8-
amqp==1.4.9 # via kombu
9-
anyjson==0.3.3 # via kombu
8+
amqp==2.6.1 # via kombu
109
babel==2.8.0 # via sphinx
11-
billiard==3.3.0.23 # via celery
10+
billiard==3.5.0.5 # via celery
1211
bleach==3.1.5 # via readme-renderer
13-
celery==3.1.26.post2 # via -r requirements/base.in
14-
certifi==2020.4.5.1 # via requests
12+
celery==4.2.2 # via -c requirements/constraints.txt, -r requirements/base.in
13+
certifi==2020.6.20 # via requests
1514
chardet==3.0.4 # via doc8, requests
1615
django-model-utils==4.0.0 # via -r requirements/base.in
17-
django==2.2.12 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, jsonfield2
18-
doc8==0.8.0 # via -r requirements/doc.in
16+
django==2.2.15 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, jsonfield2
17+
doc8==0.8.1 # via -r requirements/doc.in
1918
docutils==0.16 # via doc8, readme-renderer, restructuredtext-lint, sphinx
2019
edx-sphinx-theme==1.5.0 # via -r requirements/doc.in
2120
future==0.18.2 # via -r requirements/base.in
22-
idna==2.9 # via requests
21+
idna==2.10 # via requests
2322
imagesize==1.2.0 # via sphinx
2423
jinja2==2.11.2 # via sphinx
2524
jsonfield2==3.0.3 # via -c requirements/constraints.txt, -r requirements/base.in
26-
kombu==3.0.37 # via celery
25+
kombu==4.3.0 # via celery
2726
markupsafe==1.1.1 # via jinja2
2827
packaging==20.4 # via bleach, sphinx
2928
pbr==5.4.5 # via stevedore
3029
pockets==0.9.1 # via sphinxcontrib-napoleon
31-
pygments==2.6.1 # via readme-renderer, sphinx
30+
pygments==2.6.1 # via doc8, readme-renderer, sphinx
3231
pyparsing==2.4.7 # via packaging
3332
pytz==2020.1 # via babel, celery, django
3433
readme-renderer==26.0 # via -r requirements/doc.in
35-
requests==2.23.0 # via sphinx
36-
restructuredtext-lint==1.3.0 # via doc8
34+
requests==2.24.0 # via sphinx
35+
restructuredtext-lint==1.3.1 # via doc8
3736
six==1.15.0 # via bleach, doc8, edx-sphinx-theme, packaging, pockets, readme-renderer, sphinxcontrib-napoleon, stevedore
3837
snowballstemmer==2.0.0 # via sphinx
39-
sphinx==3.0.3 # via -r requirements/doc.in, edx-sphinx-theme
38+
sphinx==3.2.1 # via -r requirements/doc.in, edx-sphinx-theme
4039
sphinxcontrib-applehelp==1.0.2 # via sphinx
4140
sphinxcontrib-devhelp==1.0.2 # via sphinx
4241
sphinxcontrib-htmlhelp==1.0.3 # via sphinx
@@ -46,7 +45,8 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx
4645
sphinxcontrib-serializinghtml==1.1.4 # via sphinx
4746
sqlparse==0.3.1 # via django
4847
stevedore==1.32.0 # via doc8
49-
urllib3==1.25.9 # via requests
48+
urllib3==1.25.10 # via requests
49+
vine==1.3.0 # via amqp
5050
webencodings==0.5.1 # via bleach
5151

5252
# The following packages are considered to be unsafe in a requirements file:

requirements/quality.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
astroid==2.3.3 # via pylint, pylint-celery
88
click-log==0.3.2 # via edx-lint
99
click==7.1.2 # via click-log, edx-lint
10-
edx-lint==1.4.1 # via -r requirements/quality.in
10+
edx-lint==1.5.2 # via -r requirements/quality.in
1111
isort==4.3.21 # via -r requirements/quality.in, pylint
1212
lazy-object-proxy==1.4.3 # via astroid
1313
mccabe==0.6.1 # via pylint
@@ -16,7 +16,7 @@ pydocstyle==3.0.0 # via -r requirements/quality.in
1616
pylint-celery==0.3 # via edx-lint
1717
pylint-django==2.0.11 # via edx-lint
1818
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
19-
pylint==2.4.2 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
19+
pylint==2.4.4 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
2020
six==1.15.0 # via astroid, edx-lint, pydocstyle
2121
snowballstemmer==2.0.0 # via pydocstyle
2222
typed-ast==1.4.1 # via astroid

requirements/test.txt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,34 @@
44
#
55
# make upgrade
66
#
7-
amqp==1.4.9 # via kombu
8-
anyjson==0.3.3 # via kombu
9-
attrs==19.3.0 # via pytest
10-
billiard==3.3.0.23 # via celery
11-
celery==3.1.26.post2 # via -r requirements/base.in
12-
coverage==5.1 # via pytest-cov
7+
amqp==2.6.1 # via kombu
8+
attrs==20.1.0 # via pytest
9+
billiard==3.5.0.5 # via celery
10+
celery==4.2.2 # via -c requirements/constraints.txt, -r requirements/base.in
11+
coverage==5.2.1 # via pytest-cov
1312
ddt==1.4.1 # via -r requirements/test.in
1413
django-model-utils==4.0.0 # via -r requirements/base.in
1514
freezegun==0.3.15 # via -r requirements/test.in
1615
future==0.18.2 # via -r requirements/base.in
17-
importlib-metadata==1.6.0 # via pluggy, pytest
16+
importlib-metadata==1.7.0 # via pluggy, pytest
17+
iniconfig==1.0.1 # via pytest
1818
jsonfield2==3.0.3 # via -c requirements/constraints.txt, -r requirements/base.in
19-
kombu==3.0.37 # via celery
19+
kombu==4.3.0 # via celery
2020
mock==3.0.5 # via -r requirements/test.in
21-
more-itertools==8.3.0 # via pytest
21+
more-itertools==8.4.0 # via pytest
2222
packaging==20.4 # via pytest
2323
pathlib2==2.3.5 # via pytest
2424
pluggy==0.13.1 # via pytest
25-
py==1.8.1 # via pytest
25+
py==1.9.0 # via pytest
2626
pyparsing==2.4.7 # via packaging
27-
pytest-cov==2.8.1 # via -r requirements/test.in
27+
pytest-cov==2.10.1 # via -r requirements/test.in
2828
pytest-django==3.9.0 # via -r requirements/test.in
29-
pytest==5.4.2 # via pytest-cov, pytest-django
29+
pytest==6.0.1 # via pytest-cov, pytest-django
3030
python-dateutil==2.8.1 # via freezegun
3131
python-memcached==1.59 # via -r requirements/test.in
3232
pytz==2020.1 # via celery, django
3333
six==1.15.0 # via freezegun, mock, packaging, pathlib2, python-dateutil, python-memcached
3434
sqlparse==0.3.1 # via django
35-
wcwidth==0.1.9 # via pytest
35+
toml==0.10.1 # via pytest
36+
vine==1.3.0 # via amqp
3637
zipp==1.2.0 # via importlib-metadata

0 commit comments

Comments
 (0)