Skip to content

Commit 8a97607

Browse files
author
M. Zulqarnain
authored
Fix Django 3.x deprecation warnings (openedx#1449)
* Make upgrade to fix deprecation warnings
1 parent 30d4b6b commit 8a97607

File tree

7 files changed

+58
-57
lines changed

7 files changed

+58
-57
lines changed

pylintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,8 @@ disable =
362362
useless-suppression,
363363
bad-option-value,
364364
missing-function-docstring,
365-
missing-class-docstring
365+
missing-class-docstring,
366+
import-outside-toplevel
366367

367368
[REPORTS]
368369
output-format = text

requirements/base.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ chardet==3.0.4 # via requests
1212
defusedxml==0.6.0 # via -r requirements/base.in
1313
django-model-utils==4.0.0 # via -r requirements/base.in, edx-submissions
1414
django-simple-history==2.11.0 # via -r requirements/base.in
15-
django==2.2.13 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, edx-i18n-tools, edx-submissions, jsonfield2
15+
django==2.2.14 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, edx-i18n-tools, edx-submissions, jsonfield2
1616
djangorestframework==3.9.4 # via -r requirements/base.in, edx-submissions
1717
edx-i18n-tools==0.5.3 # via -r requirements/base.in
18-
edx-submissions==3.1.11 # via -r requirements/base.in
18+
edx-submissions==3.1.12 # via -r requirements/base.in
1919
fs==2.0.18 # via -c requirements/constraints.txt, xblock
2020
html5lib==1.1 # via -r requirements/base.in
2121
idna==2.8 # via -c requirements/constraints.txt, requests
22-
importlib-metadata==1.6.1 # via path
22+
importlib-metadata==1.7.0 # via path
2323
jsonfield2==3.0.3 # via -c requirements/constraints.txt, -r requirements/base.in, edx-submissions
2424
lazy==1.4 # via -r requirements/base.in
2525
libsass==0.20.0 # via -r requirements/base.in
2626
loremipsum==1.0.5 # via -c requirements/constraints.txt, -r requirements/base.in
27-
lxml==4.5.1 # via -r requirements/base.in, xblock
27+
lxml==4.5.2 # via -r requirements/base.in, xblock
2828
markupsafe==1.1.1 # via xblock
2929
more-itertools==8.4.0 # via zipp
3030
packaging==20.4 # via bleach

requirements/quality.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ attrs==19.3.0 # via -r requirements/test.txt, jsonschema, pytest
1111
aws-sam-translator==1.25.0 # via -r requirements/test.txt, cfn-lint
1212
aws-xray-sdk==2.6.0 # via -r requirements/test.txt, moto
1313
bleach==3.1.5 # via -r requirements/test.txt
14-
boto3==1.14.11 # via -r requirements/test.txt, aws-sam-translator, fs-s3fs, moto
14+
boto3==1.14.21 # via -r requirements/test.txt, aws-sam-translator, fs-s3fs, moto
1515
boto==2.39.0 # via -c requirements/constraints.txt, -r requirements/test.txt, moto
16-
botocore==1.17.11 # via -r requirements/test.txt, aws-xray-sdk, boto3, moto, s3transfer
16+
botocore==1.17.21 # via -r requirements/test.txt, aws-xray-sdk, boto3, moto, s3transfer
1717
certifi==2020.6.20 # via -r requirements/test.txt, requests
1818
cffi==1.14.0 # via -r requirements/test.txt, cryptography
1919
cfn-lint==0.33.2 # via -r requirements/test.txt, moto
2020
chardet==3.0.4 # via -r requirements/test.txt, requests
2121
click-log==0.3.2 # via edx-lint
2222
click==7.1.2 # via click-log, edx-lint
23-
coverage==5.1 # via -r requirements/test.txt, pytest-cov
23+
coverage==5.2 # via -r requirements/test.txt, pytest-cov
2424
cryptography==2.9.2 # via -r requirements/test.txt, moto, sshpubkeys
2525
ddt==1.0.0 # via -c requirements/constraints.txt, -r requirements/test.txt
2626
decorator==4.4.2 # via -r requirements/test.txt, networkx
2727
defusedxml==0.6.0 # via -r requirements/test.txt
28-
distlib==0.3.0 # via -r requirements/test.txt, virtualenv
28+
distlib==0.3.1 # via -r requirements/test.txt, virtualenv
2929
django-model-utils==4.0.0 # via -r requirements/test.txt, edx-submissions
30-
django-pyfs==2.1 # via -r requirements/test.txt
30+
django-pyfs==2.2 # via -r requirements/test.txt
3131
django-simple-history==2.11.0 # via -r requirements/test.txt
32-
django==2.2.13 # via -c requirements/constraints.txt, -r requirements/test.txt, django-model-utils, django-pyfs, edx-i18n-tools, edx-submissions, jsonfield2, xblock-sdk
32+
django==2.2.14 # via -c requirements/constraints.txt, -r requirements/test.txt, django-model-utils, django-pyfs, edx-i18n-tools, edx-submissions, jsonfield2, xblock-sdk
3333
djangorestframework==3.9.4 # via -r requirements/test.txt, edx-submissions
34-
docker==4.2.1 # via -r requirements/test.txt, moto
34+
docker==4.2.2 # via -r requirements/test.txt, moto
3535
docutils==0.15.2 # via -r requirements/test.txt, botocore
3636
ecdsa==0.15 # via -r requirements/test.txt, python-jose, sshpubkeys
3737
edx-i18n-tools==0.5.3 # via -r requirements/test.txt
38-
edx-lint==1.4.1 # via -r requirements/quality.in
39-
edx-submissions==3.1.11 # via -r requirements/test.txt
38+
edx-lint==1.5.0 # via -r requirements/quality.in
39+
edx-submissions==3.1.12 # via -r requirements/test.txt
4040
factory-boy==2.12.0 # via -r requirements/test.txt
4141
faker==4.1.1 # via -r requirements/test.txt, factory-boy
4242
filelock==3.0.12 # via -r requirements/test.txt, tox, virtualenv
@@ -46,7 +46,7 @@ fs==2.0.18 # via -c requirements/constraints.txt, -r requirements
4646
future==0.18.2 # via -r requirements/test.txt, aws-xray-sdk
4747
html5lib==1.1 # via -r requirements/test.txt
4848
idna==2.8 # via -c requirements/constraints.txt, -r requirements/test.txt, moto, requests
49-
importlib-metadata==1.6.1 # via -r requirements/test.txt, importlib-resources, jsonpickle, jsonschema, path, pluggy, tox, virtualenv
49+
importlib-metadata==1.7.0 # via -r requirements/test.txt, importlib-resources, jsonpickle, jsonschema, path, pluggy, tox, virtualenv
5050
importlib-resources==1.5.0 # via -r requirements/test.txt, cfn-lint, virtualenv
5151
isort==4.3.21 # via pylint
5252
jinja2==2.11.2 # via -r requirements/test.txt, moto
@@ -62,7 +62,7 @@ lazy-object-proxy==1.4.3 # via astroid
6262
lazy==1.4 # via -r requirements/test.txt
6363
libsass==0.20.0 # via -r requirements/test.txt
6464
loremipsum==1.0.5 # via -c requirements/constraints.txt, -r requirements/test.txt
65-
lxml==4.5.1 # via -r requirements/test.txt, xblock
65+
lxml==4.5.2 # via -r requirements/test.txt, xblock
6666
markupsafe==1.1.1 # via -r requirements/test.txt, jinja2, xblock
6767
mccabe==0.6.1 # via pylint
6868
mock==3.0.5 # via -c requirements/constraints.txt, -r requirements/test.txt, moto
@@ -82,7 +82,7 @@ pycparser==2.20 # via -r requirements/test.txt, cffi
8282
pylint-celery==0.3 # via edx-lint
8383
pylint-django==2.0.11 # via edx-lint
8484
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
85-
pylint==2.4.2 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
85+
pylint==2.4.4 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
8686
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
8787
pyrsistent==0.16.0 # via -r requirements/test.txt, jsonschema
8888
pytest-cov==2.7.1 # via -r requirements/test.txt
@@ -97,16 +97,16 @@ requests==2.24.0 # via -r requirements/test.txt, docker, moto, python-s
9797
responses==0.10.15 # via -r requirements/test.txt, moto
9898
rsa==4.6 # via -r requirements/test.txt, python-jose
9999
s3transfer==0.3.3 # via -r requirements/test.txt, boto3
100-
six==1.15.0 # via -r requirements/test.txt, astroid, aws-sam-translator, bleach, cfn-lint, cryptography, django-pyfs, django-simple-history, docker, ecdsa, edx-i18n-tools, edx-lint, freezegun, fs, fs-s3fs, html5lib, jsonschema, junit-xml, libsass, mock, moto, packaging, pathlib2, pyrsistent, pytest, python-dateutil, python-jose, python-swiftclient, responses, tox, virtualenv, websocket-client, xblock
100+
six==1.15.0 # via -r requirements/test.txt, astroid, aws-sam-translator, bleach, cfn-lint, cryptography, django-simple-history, docker, ecdsa, edx-i18n-tools, edx-lint, freezegun, fs, fs-s3fs, html5lib, jsonschema, junit-xml, libsass, mock, moto, packaging, pathlib2, pyrsistent, pytest, python-dateutil, python-jose, python-swiftclient, responses, tox, virtualenv, websocket-client, xblock
101101
sqlparse==0.3.1 # via -r requirements/test.txt, django
102102
sshpubkeys==3.1.0 # via -r requirements/test.txt, moto
103103
testfixtures==6.14.1 # via -r requirements/test.txt
104104
text-unidecode==1.3 # via -r requirements/test.txt, faker
105105
toml==0.10.1 # via -r requirements/test.txt, tox
106-
tox==3.15.2 # via -r requirements/test.txt
106+
tox==3.17.1 # via -r requirements/test.txt
107107
typed-ast==1.4.1 # via astroid
108108
urllib3==1.25.9 # via -r requirements/test.txt, botocore, requests
109-
virtualenv==20.0.25 # via -r requirements/test.txt, tox
109+
virtualenv==20.0.27 # via -r requirements/test.txt, tox
110110
voluptuous==0.11.7 # via -c requirements/constraints.txt, -r requirements/test.txt
111111
wcwidth==0.2.5 # via -r requirements/test.txt, pytest
112112
web-fragments==0.3.2 # via -r requirements/test.txt, xblock

requirements/test-acceptance.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@ aws-sam-translator==1.25.0 # via -r requirements/test.txt, cfn-lint
1111
aws-xray-sdk==2.6.0 # via -r requirements/test.txt, moto
1212
bleach==3.1.5 # via -r requirements/test.txt
1313
bok-choy==1.1.1 # via -r requirements/test-acceptance.in
14-
boto3==1.14.11 # via -r requirements/test.txt, aws-sam-translator, fs-s3fs, moto
14+
boto3==1.14.21 # via -r requirements/test.txt, aws-sam-translator, fs-s3fs, moto
1515
boto==2.39.0 # via -c requirements/constraints.txt, -r requirements/test.txt, moto
16-
botocore==1.17.11 # via -r requirements/test.txt, aws-xray-sdk, boto3, moto, s3transfer
16+
botocore==1.17.21 # via -r requirements/test.txt, aws-xray-sdk, boto3, moto, s3transfer
1717
certifi==2020.6.20 # via -r requirements/test.txt, requests
1818
cffi==1.14.0 # via -r requirements/test.txt, cryptography
1919
cfn-lint==0.33.2 # via -r requirements/test.txt, moto
2020
chardet==3.0.4 # via -r requirements/test.txt, requests
21-
coverage==5.1 # via -r requirements/test.txt, pytest-cov
21+
coverage==5.2 # via -r requirements/test.txt, pytest-cov
2222
cryptography==2.9.2 # via -r requirements/test.txt, moto, sshpubkeys
2323
ddt==1.0.0 # via -c requirements/constraints.txt, -r requirements/test-acceptance.in, -r requirements/test.txt
2424
decorator==4.4.2 # via -r requirements/test.txt, networkx
2525
defusedxml==0.6.0 # via -r requirements/test.txt
26-
distlib==0.3.0 # via -r requirements/test.txt, virtualenv
26+
distlib==0.3.1 # via -r requirements/test.txt, virtualenv
2727
django-model-utils==4.0.0 # via -r requirements/test.txt, edx-submissions
28-
django-pyfs==2.1 # via -r requirements/test.txt
28+
django-pyfs==2.2 # via -r requirements/test.txt
2929
django-simple-history==2.11.0 # via -r requirements/test.txt
30-
django==2.2.13 # via -c requirements/constraints.txt, -r requirements/test.txt, django-model-utils, django-pyfs, edx-i18n-tools, edx-submissions, jsonfield2, xblock-sdk
30+
django==2.2.14 # via -c requirements/constraints.txt, -r requirements/test.txt, django-model-utils, django-pyfs, edx-i18n-tools, edx-submissions, jsonfield2, xblock-sdk
3131
djangorestframework==3.9.4 # via -r requirements/test.txt, edx-submissions
32-
docker==4.2.1 # via -r requirements/test.txt, moto
32+
docker==4.2.2 # via -r requirements/test.txt, moto
3333
docutils==0.15.2 # via -r requirements/test.txt, botocore
3434
ecdsa==0.15 # via -r requirements/test.txt, python-jose, sshpubkeys
3535
edx-i18n-tools==0.5.3 # via -r requirements/test.txt
36-
edx-submissions==3.1.11 # via -r requirements/test.txt
36+
edx-submissions==3.1.12 # via -r requirements/test.txt
3737
factory-boy==2.12.0 # via -r requirements/test.txt
3838
faker==4.1.1 # via -r requirements/test.txt, factory-boy
3939
filelock==3.0.12 # via -r requirements/test.txt, tox, virtualenv
@@ -43,7 +43,7 @@ fs==2.0.18 # via -c requirements/constraints.txt, -r requirements
4343
future==0.18.2 # via -r requirements/test.txt, aws-xray-sdk
4444
html5lib==1.1 # via -r requirements/test.txt
4545
idna==2.8 # via -c requirements/constraints.txt, -r requirements/test.txt, moto, requests
46-
importlib-metadata==1.6.1 # via -r requirements/test.txt, importlib-resources, jsonpickle, jsonschema, path, pluggy, tox, virtualenv
46+
importlib-metadata==1.7.0 # via -r requirements/test.txt, importlib-resources, jsonpickle, jsonschema, path, pluggy, tox, virtualenv
4747
importlib-resources==1.5.0 # via -r requirements/test.txt, cfn-lint, virtualenv
4848
jinja2==2.11.2 # via -r requirements/test.txt, moto
4949
jmespath==0.10.0 # via -r requirements/test.txt, boto3, botocore
@@ -57,7 +57,7 @@ junit-xml==1.9 # via -r requirements/test.txt, cfn-lint
5757
lazy==1.4 # via -r requirements/test.txt, bok-choy
5858
libsass==0.20.0 # via -r requirements/test.txt
5959
loremipsum==1.0.5 # via -c requirements/constraints.txt, -r requirements/test.txt
60-
lxml==4.5.1 # via -r requirements/test.txt, xblock
60+
lxml==4.5.2 # via -r requirements/test.txt, xblock
6161
markupsafe==1.1.1 # via -r requirements/test.txt, jinja2, xblock
6262
mock==3.0.5 # via -c requirements/constraints.txt, -r requirements/test.txt, moto
6363
more-itertools==8.4.0 # via -r requirements/test.txt, pytest, zipp
@@ -89,15 +89,15 @@ responses==0.10.15 # via -r requirements/test.txt, moto
8989
rsa==4.6 # via -r requirements/test.txt, python-jose
9090
s3transfer==0.3.3 # via -r requirements/test.txt, boto3
9191
selenium==3.141.0 # via -r requirements/test-acceptance.in, bok-choy
92-
six==1.15.0 # via -r requirements/test.txt, aws-sam-translator, bleach, bok-choy, cfn-lint, cryptography, django-pyfs, django-simple-history, docker, ecdsa, edx-i18n-tools, freezegun, fs, fs-s3fs, html5lib, jsonschema, junit-xml, libsass, mock, moto, packaging, pathlib2, pyrsistent, pytest, python-dateutil, python-jose, python-swiftclient, responses, tox, virtualenv, websocket-client, xblock
92+
six==1.15.0 # via -r requirements/test.txt, aws-sam-translator, bleach, bok-choy, cfn-lint, cryptography, django-simple-history, docker, ecdsa, edx-i18n-tools, freezegun, fs, fs-s3fs, html5lib, jsonschema, junit-xml, libsass, mock, moto, packaging, pathlib2, pyrsistent, pytest, python-dateutil, python-jose, python-swiftclient, responses, tox, virtualenv, websocket-client, xblock
9393
sqlparse==0.3.1 # via -r requirements/test.txt, django
9494
sshpubkeys==3.1.0 # via -r requirements/test.txt, moto
9595
testfixtures==6.14.1 # via -r requirements/test.txt
9696
text-unidecode==1.3 # via -r requirements/test.txt, faker
9797
toml==0.10.1 # via -r requirements/test.txt, tox
98-
tox==3.15.2 # via -r requirements/test.txt
98+
tox==3.17.1 # via -r requirements/test.txt
9999
urllib3==1.25.9 # via -r requirements/test.txt, botocore, requests, selenium
100-
virtualenv==20.0.25 # via -r requirements/test.txt, tox
100+
virtualenv==20.0.27 # via -r requirements/test.txt, tox
101101
voluptuous==0.11.7 # via -c requirements/constraints.txt, -r requirements/test.txt
102102
wcwidth==0.2.5 # via -r requirements/test.txt, pytest
103103
web-fragments==0.3.2 # via -r requirements/test.txt, xblock

0 commit comments

Comments
 (0)