Skip to content

Commit e4dcc5f

Browse files
timmc-edxtimmc-edx
authored
Remove django-celery (#25)
- BOM-1334: Remove django-celery; it is no longer maintained, and might also block upgrade to Django 2 - Upgrade deps; pin several to keep Django 1.11
1 parent 48612b9 commit e4dcc5f

File tree

14 files changed

+320
-280
lines changed

14 files changed

+320
-280
lines changed

‎CHANGELOG.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ Change Log
1414
Unreleased
1515
~~~~~~~~~~
1616

17+
[0.9.7] - 2020-03-05
18+
~~~~~~~~~~~~~~~~~~~~
19+
20+
* Remove django-celery dependency
21+
22+
[0.9.6] - 2019-11-20
23+
~~~~~~~~~~~~~~~~~~~~
24+
25+
* Django 2.2 support
26+
1727
[0.9.5] - 2019-10-08
1828
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1929

‎README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Testing
2626

2727
make requirements
2828

29-
Will install all pre-requisuites. ::
29+
Will install all prerequisites. ::
3030

3131
make test
3232

‎requirements/base.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
Django>=1.11 # Web application framework
55
django-model-utils # Provides TimeStampedModel abstract base class
6-
django-celery
76
django-crum
87
djangorestframework
98
edx-celeryutils

‎requirements/base.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ amqp==1.4.9 # via kombu
88
anyjson==0.3.3 # via kombu
99
billiard==3.3.0.23 # via celery
1010
celery==3.1.26.post2 # via django-celery, edx-celeryutils
11-
django-celery==3.3.1
12-
django-crum==0.7.4
13-
django-model-utils==3.0.0
14-
django==1.11.26
15-
djangorestframework==3.9.4
16-
edx-celeryutils==0.3.0
11+
django-celery==3.3.1 # via edx-celeryutils
12+
django-crum==0.7.5 # via -r requirements/base.in
13+
django-model-utils==3.0.0 # via -c requirements/constraints.txt, -r requirements/base.in, edx-celeryutils
14+
django==1.11.29 # via -r requirements/base.in, django-celery, django-crum, django-model-utils, edx-celeryutils, jsonfield2
15+
djangorestframework==3.9.4 # via -r requirements/base.in
16+
edx-celeryutils==0.3.2 # via -r requirements/base.in
1717
future==0.18.2 # via edx-celeryutils
18-
jsonfield==2.0.2 # via edx-celeryutils
18+
jsonfield2==3.0.0 # via -c requirements/constraints.txt, edx-celeryutils
1919
kombu==3.0.37 # via celery
2020
pytz==2019.3 # via celery, django
21-
simplejson==3.16.0
21+
simplejson==3.17.0 # via -r requirements/base.in

‎requirements/constraints.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ Sphinx<1.8.5
2121
more-itertools<6.0.0
2222

2323
path.py<12.0 # path.py 12.0 drops support for python 2.7
24+
25+
# django-model-utils 4.0.0 drops support for python 2.7, which blocks Django 1.11
26+
django-model-utils<4.0.0
27+
28+
# jsonfield2 3.1.0 drops support for python 3.5
29+
jsonfield2<3.1.0

‎requirements/dev.txt‎

Lines changed: 91 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -4,94 +4,99 @@
44
#
55
# make upgrade
66
#
7-
amqp==1.4.9
8-
anyjson==0.3.3
9-
argparse==1.4.0
10-
astroid==1.6.6
11-
atomicwrites==1.3.0
12-
attrs==19.3.0
13-
backports.functools-lru-cache==1.6.1
14-
billiard==3.3.0.23
15-
caniusepython3==7.2.0
16-
celery==3.1.26.post2
17-
certifi==2019.9.11
18-
chardet==3.0.4
19-
click-log==0.3.2
20-
click==7.0
21-
code-annotations==0.3.2
22-
codecov==2.0.15
23-
configparser==4.0.2
24-
contextlib2==0.6.0.post1
25-
coverage==4.5.4
26-
ddt==1.2.1
27-
diff-cover==2.4.0
28-
distlib==0.3.0
29-
django-celery==3.3.1
30-
django-crum==0.7.4
31-
django-model-utils==3.0.0
32-
django==1.11.26
33-
djangorestframework==3.9.4
34-
edx-celeryutils==0.3.0
35-
edx-i18n-tools==0.4.8
36-
edx-lint==1.4.1
37-
enum34==1.1.6
38-
filelock==3.0.12
39-
freezegun==0.3.12
40-
funcsigs==1.0.2
41-
future==0.18.2
42-
futures==3.3.0 ; python_version == "2.7"
43-
idna==2.8
44-
importlib-metadata==0.23
7+
amqp==1.4.9 # via -r requirements/quality.txt, kombu
8+
anyjson==0.3.3 # via -r requirements/quality.txt, kombu
9+
appdirs==1.4.3 # via -r requirements/travis.txt, virtualenv
10+
argparse==1.4.0 # via -r requirements/quality.txt, caniusepython3
11+
astroid==1.6.6 # via -r requirements/quality.txt, pylint, pylint-celery
12+
atomicwrites==1.3.0 # via -r requirements/quality.txt, pytest
13+
attrs==19.3.0 # via -r requirements/quality.txt, pytest
14+
backports.functools-lru-cache==1.6.1 # via -r requirements/quality.txt, astroid, caniusepython3, isort, pylint
15+
backports.os==0.1.1 # via path.py
16+
billiard==3.3.0.23 # via -r requirements/quality.txt, celery
17+
caniusepython3==7.2.0 # via -r requirements/quality.txt
18+
celery==3.1.26.post2 # via -r requirements/quality.txt, django-celery, edx-celeryutils
19+
certifi==2019.11.28 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
20+
chardet==3.0.4 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
21+
click-log==0.3.2 # via -r requirements/quality.txt, edx-lint
22+
click==7.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
23+
code-annotations==0.3.3 # via -r requirements/quality.txt
24+
codecov==2.0.16 # via -r requirements/travis.txt
25+
configparser==4.0.2 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, pydocstyle, pylint
26+
contextlib2==0.6.0.post1 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, virtualenv, zipp
27+
coverage==5.0.3 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
28+
ddt==1.2.2 # via -r requirements/quality.txt
29+
diff-cover==2.6.0 # via -r requirements/dev.in
30+
distlib==0.3.0 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, virtualenv
31+
django-celery==3.3.1 # via -r requirements/quality.txt, edx-celeryutils
32+
django-crum==0.7.5 # via -r requirements/quality.txt
33+
django-model-utils==3.0.0 # via -c requirements/constraints.txt, -r requirements/quality.txt, edx-celeryutils
34+
django==1.11.29 # via -r requirements/quality.txt, code-annotations, django-celery, django-crum, django-model-utils, edx-celeryutils, edx-i18n-tools, jsonfield2
35+
djangorestframework==3.9.4 # via -r requirements/quality.txt
36+
edx-celeryutils==0.3.2 # via -r requirements/quality.txt
37+
edx-i18n-tools==0.5.0 # via -r requirements/dev.in
38+
edx-lint==1.4.1 # via -r requirements/quality.txt
39+
enum34==1.1.9 # via -r requirements/quality.txt, astroid
40+
filelock==3.0.12 # via -r requirements/travis.txt, tox, virtualenv
41+
freezegun==0.3.15 # via -r requirements/quality.txt
42+
funcsigs==1.0.2 # via -r requirements/quality.txt, mock, pytest
43+
future==0.18.2 # via -r requirements/quality.txt, edx-celeryutils
44+
futures==3.3.0 ; python_version == "2.7" # via -c requirements/constraints.txt, -r requirements/quality.txt, caniusepython3, isort
45+
idna==2.9 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
46+
importlib-metadata==1.5.0 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-resources, path.py, pluggy, pytest, tox, virtualenv
47+
importlib-resources==1.2.0 # via -r requirements/travis.txt, virtualenv
4548
inflect==3.0.2 # via jinja2-pluralize
46-
isort==4.3.21
49+
isort==4.3.21 # via -r requirements/quality.txt, pylint
4750
jinja2-pluralize==0.3.0 # via diff-cover
48-
jinja2==2.10.3
49-
jsonfield==2.0.2
50-
kombu==3.0.37
51-
lazy-object-proxy==1.4.3
52-
markupsafe==1.1.1
53-
mccabe==0.6.1
54-
mock==3.0.5
55-
more-itertools==5.0.0
56-
packaging==19.2
57-
path.py==11.5.2 # via edx-i18n-tools
58-
pathlib2==2.3.5
59-
pbr==5.4.3
60-
pip-tools==4.2.0
61-
pluggy==0.13.0
51+
jinja2==2.11.1 # via -r requirements/quality.txt, code-annotations, diff-cover, jinja2-pluralize
52+
jsonfield2==3.0.0 # via -c requirements/constraints.txt, -r requirements/quality.txt, edx-celeryutils
53+
kombu==3.0.37 # via -r requirements/quality.txt, celery
54+
lazy-object-proxy==1.4.3 # via -r requirements/quality.txt, astroid
55+
markupsafe==1.1.1 # via -r requirements/quality.txt, jinja2
56+
mccabe==0.6.1 # via -r requirements/quality.txt, pylint
57+
mock==3.0.5 # via -r requirements/quality.txt
58+
more-itertools==5.0.0 # via -c requirements/constraints.txt, -r requirements/quality.txt, pytest
59+
packaging==20.3 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, pytest, tox
60+
path.py==11.5.2 # via -c requirements/constraints.txt, edx-i18n-tools
61+
pathlib2==2.3.5 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources, pytest, pytest-django, virtualenv
62+
pbr==5.4.4 # via -r requirements/quality.txt, stevedore
63+
pip-tools==4.5.1 # via -r requirements/pip-tools.txt
64+
pluggy==0.13.1 # via -r requirements/quality.txt, -r requirements/travis.txt, diff-cover, pytest, tox
6265
polib==1.1.0 # via edx-i18n-tools
63-
py==1.8.0
64-
pycodestyle==2.5.0
65-
pydocstyle==3.0.0
66-
pygments==2.4.2 # via diff-cover
67-
pylint-celery==0.3
68-
pylint-django==0.11.1
69-
pylint-plugin-utils==0.6
70-
pylint==1.9.5
71-
pyparsing==2.4.5
72-
pytest-cov==2.8.1
73-
pytest-django==3.7.0
74-
pytest==4.6.6
75-
python-dateutil==2.8.1
76-
python-slugify==4.0.0
77-
pytz==2019.3
78-
pyyaml==5.1.2
79-
requests==2.22.0
80-
scandir==1.10.0
81-
simplejson==3.16.0
82-
singledispatch==3.4.0.3
83-
six==1.13.0
84-
snowballstemmer==2.0.0
85-
stevedore==1.31.0
86-
text-unidecode==1.3
87-
toml==0.10.0
88-
tox-battery==0.5.1
89-
tox==3.14.0
90-
urllib3==1.25.7
91-
virtualenv==16.7.7
92-
wcwidth==0.1.7
93-
wrapt==1.11.2
94-
zipp==0.6.0
66+
py==1.8.1 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
67+
pycodestyle==2.5.0 # via -r requirements/quality.txt
68+
pydocstyle==3.0.0 # via -r requirements/quality.txt
69+
pygments==2.5.2 # via diff-cover
70+
pylint-celery==0.3 # via -r requirements/quality.txt, edx-lint
71+
pylint-django==0.11.1 # via -r requirements/quality.txt, edx-lint
72+
pylint-plugin-utils==0.6 # via -r requirements/quality.txt, pylint-celery, pylint-django
73+
pylint==1.9.5 # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
74+
pyparsing==2.4.6 # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
75+
pytest-cov==2.8.1 # via -r requirements/quality.txt
76+
pytest-django==3.8.0 # via -r requirements/quality.txt
77+
pytest==4.6.9 # via -r requirements/quality.txt, pytest-cov, pytest-django
78+
python-dateutil==2.8.1 # via -r requirements/quality.txt, freezegun
79+
python-slugify==4.0.0 # via -r requirements/quality.txt, code-annotations
80+
pytz==2019.3 # via -r requirements/quality.txt, celery, django
81+
pyyaml==5.3 # via -r requirements/quality.txt, code-annotations, edx-i18n-tools
82+
requests==2.23.0 # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, codecov
83+
scandir==1.10.0 # via -r requirements/quality.txt, -r requirements/travis.txt, pathlib2
84+
simplejson==3.17.0 # via -r requirements/quality.txt
85+
singledispatch==3.4.0.3 # via -r requirements/quality.txt, -r requirements/travis.txt, astroid, importlib-resources, pylint
86+
six==1.14.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, diff-cover, edx-i18n-tools, edx-lint, freezegun, mock, more-itertools, packaging, pathlib2, pip-tools, pydocstyle, pylint, pytest, python-dateutil, singledispatch, stevedore, tox, virtualenv
87+
snowballstemmer==2.0.0 # via -r requirements/quality.txt, pydocstyle
88+
sqlalchemy==1.3.13 # via -r requirements/quality.txt
89+
stevedore==1.32.0 # via -r requirements/quality.txt, code-annotations
90+
text-unidecode==1.3 # via -r requirements/quality.txt, python-slugify
91+
toml==0.10.0 # via -r requirements/travis.txt, tox
92+
tox-battery==0.5.2 # via -r requirements/travis.txt
93+
tox==3.14.5 # via -r requirements/travis.txt, tox-battery
94+
typing==3.7.4.1 # via -r requirements/travis.txt, importlib-resources
95+
urllib3==1.25.8 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
96+
virtualenv==20.0.8 # via -r requirements/travis.txt, tox
97+
wcwidth==0.1.8 # via -r requirements/quality.txt, pytest
98+
wrapt==1.12.0 # via -r requirements/quality.txt, astroid
99+
zipp==1.2.0 # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources
95100

96101
# The following packages are considered to be unsafe in a requirements file:
97-
# setuptools==41.6.0 # via caniusepython3
102+
# setuptools

‎requirements/doc.txt‎

Lines changed: 70 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,75 @@
44
#
55
# make upgrade
66
#
7-
amqp==1.4.9
8-
anyjson==0.3.3
9-
atomicwrites==1.3.0
10-
attrs==19.3.0
11-
billiard==3.3.0.23
12-
bleach==3.1.0 # via readme-renderer
13-
celery==3.1.26.post2
14-
chardet==3.0.4 # via doc8
15-
click==7.0
16-
code-annotations==0.3.2
17-
configparser==4.0.2
18-
contextlib2==0.6.0.post1
19-
coverage==4.5.4
20-
ddt==1.2.1
21-
django-celery==3.3.1
22-
django-crum==0.7.4
23-
django-model-utils==3.0.0
24-
django==1.11.26
25-
djangorestframework==3.9.4
26-
doc8==0.8.0
27-
docutils==0.15.2 # via doc8, readme-renderer, restructuredtext-lint
28-
edx-celeryutils==0.3.0
29-
edx-sphinx-theme==1.5.0
30-
freezegun==0.3.12
31-
funcsigs==1.0.2
32-
future==0.18.2
33-
importlib-metadata==0.23
34-
jinja2==2.10.3
35-
jsonfield==2.0.2
36-
kombu==3.0.37
37-
markupsafe==1.1.1
38-
mock==3.0.5
39-
more-itertools==5.0.0
40-
packaging==19.2
41-
pathlib2==2.3.5
42-
pbr==5.4.3
43-
pluggy==0.13.0
44-
py==1.8.0
45-
pygments==2.4.2 # via readme-renderer
46-
pyparsing==2.4.5
47-
pytest-cov==2.8.1
48-
pytest-django==3.7.0
49-
pytest==4.6.6
50-
python-dateutil==2.8.1
51-
python-slugify==4.0.0
52-
pytz==2019.3
53-
pyyaml==5.1.2
54-
readme-renderer==24.0
7+
alabaster==0.7.12 # via sphinx
8+
amqp==1.4.9 # via -r requirements/test.txt, kombu
9+
anyjson==0.3.3 # via -r requirements/test.txt, kombu
10+
atomicwrites==1.3.0 # via -r requirements/test.txt, pytest
11+
attrs==19.3.0 # via -r requirements/test.txt, pytest
12+
babel==2.8.0 # via sphinx
13+
billiard==3.3.0.23 # via -r requirements/test.txt, celery
14+
bleach==3.1.1 # via readme-renderer
15+
celery==3.1.26.post2 # via -r requirements/test.txt, django-celery, edx-celeryutils
16+
certifi==2019.11.28 # via requests
17+
chardet==3.0.4 # via doc8, requests
18+
click==7.0 # via -r requirements/test.txt, code-annotations
19+
code-annotations==0.3.3 # via -r requirements/test.txt
20+
configparser==4.0.2 # via -r requirements/test.txt, importlib-metadata
21+
contextlib2==0.6.0.post1 # via -r requirements/test.txt, importlib-metadata, zipp
22+
coverage==5.0.3 # via -r requirements/test.txt, pytest-cov
23+
ddt==1.2.2 # via -r requirements/test.txt
24+
django-celery==3.3.1 # via -r requirements/test.txt, edx-celeryutils
25+
django-crum==0.7.5 # via -r requirements/test.txt
26+
django-model-utils==3.0.0 # via -c requirements/constraints.txt, -r requirements/test.txt, edx-celeryutils
27+
django==1.11.29 # via -r requirements/test.txt, code-annotations, django-celery, django-crum, django-model-utils, edx-celeryutils, jsonfield2
28+
djangorestframework==3.9.4 # via -r requirements/test.txt
29+
doc8==0.8.0 # via -r requirements/doc.in
30+
docutils==0.16 # via doc8, readme-renderer, restructuredtext-lint, sphinx
31+
edx-celeryutils==0.3.2 # via -r requirements/test.txt
32+
edx-sphinx-theme==1.5.0 # via -r requirements/doc.in
33+
freezegun==0.3.15 # via -r requirements/test.txt
34+
funcsigs==1.0.2 # via -r requirements/test.txt, mock, pytest
35+
future==0.18.2 # via -r requirements/test.txt, edx-celeryutils
36+
idna==2.9 # via requests
37+
imagesize==1.2.0 # via sphinx
38+
importlib-metadata==1.5.0 # via -r requirements/test.txt, pluggy, pytest
39+
jinja2==2.11.1 # via -r requirements/test.txt, code-annotations, sphinx
40+
jsonfield2==3.0.0 # via -c requirements/constraints.txt, -r requirements/test.txt, edx-celeryutils
41+
kombu==3.0.37 # via -r requirements/test.txt, celery
42+
markupsafe==1.1.1 # via -r requirements/test.txt, jinja2
43+
mock==3.0.5 # via -r requirements/test.txt
44+
more-itertools==5.0.0 # via -c requirements/constraints.txt, -r requirements/test.txt, pytest
45+
packaging==20.3 # via -r requirements/test.txt, pytest, sphinx
46+
pathlib2==2.3.5 # via -r requirements/test.txt, importlib-metadata, pytest, pytest-django
47+
pbr==5.4.4 # via -r requirements/test.txt, stevedore
48+
pluggy==0.13.1 # via -r requirements/test.txt, pytest
49+
py==1.8.1 # via -r requirements/test.txt, pytest
50+
pygments==2.5.2 # via readme-renderer, sphinx
51+
pyparsing==2.4.6 # via -r requirements/test.txt, packaging
52+
pytest-cov==2.8.1 # via -r requirements/test.txt
53+
pytest-django==3.8.0 # via -r requirements/test.txt
54+
pytest==4.6.9 # via -r requirements/test.txt, pytest-cov, pytest-django
55+
python-dateutil==2.8.1 # via -r requirements/test.txt, freezegun
56+
python-slugify==4.0.0 # via -r requirements/test.txt, code-annotations
57+
pytz==2019.3 # via -r requirements/test.txt, babel, celery, django
58+
pyyaml==5.3 # via -r requirements/test.txt, code-annotations
59+
readme-renderer==24.0 # via -r requirements/doc.in
60+
requests==2.23.0 # via sphinx
5561
restructuredtext-lint==1.3.0 # via doc8
56-
scandir==1.10.0
57-
simplejson==3.16.0
58-
six==1.13.0
59-
sphinx==1.8.4
60-
stevedore==1.31.0
61-
text-unidecode==1.3
62-
wcwidth==0.1.7
62+
scandir==1.10.0 # via -r requirements/test.txt, pathlib2
63+
simplejson==3.17.0 # via -r requirements/test.txt
64+
six==1.14.0 # via -r requirements/test.txt, bleach, doc8, edx-sphinx-theme, freezegun, mock, more-itertools, packaging, pathlib2, pytest, python-dateutil, readme-renderer, sphinx, stevedore
65+
snowballstemmer==2.0.0 # via sphinx
66+
sphinx==1.8.4 # via -c requirements/constraints.txt, -r requirements/doc.in, edx-sphinx-theme
67+
sphinxcontrib-websupport==1.1.2 # via sphinx
68+
sqlalchemy==1.3.13 # via -r requirements/test.txt
69+
stevedore==1.32.0 # via -r requirements/test.txt, code-annotations, doc8
70+
text-unidecode==1.3 # via -r requirements/test.txt, python-slugify
71+
typing==3.7.4.1 # via sphinx
72+
urllib3==1.25.8 # via requests
73+
wcwidth==0.1.8 # via -r requirements/test.txt, pytest
6374
webencodings==0.5.1 # via bleach
64-
zipp==0.6.0
75+
zipp==1.2.0 # via -r requirements/test.txt, importlib-metadata
76+
77+
# The following packages are considered to be unsafe in a requirements file:
78+
# setuptools

‎requirements/pip-tools.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# make upgrade
66
#
77
click==7.0 # via pip-tools
8-
pip-tools==4.2.0
9-
six==1.13.0 # via pip-tools
8+
pip-tools==4.5.1 # via -r requirements/pip-tools.in
9+
six==1.14.0 # via pip-tools

0 commit comments

Comments
 (0)