Skip to content

Commit

Permalink
Merge pull request #275 from open-craft/nizar/fix_tox_tests
Browse files Browse the repository at this point in the history
Resolves failing Python 3.8 tox tests by updating djangorestframework
  • Loading branch information
DawoudSheraz authored Jan 18, 2021
2 parents b10c7ab + 48950ea commit 5062d5a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Constraining this since we haven't handled newer versions of Django Rest Framework
# and we want to allow edx-platform to update this separately.
djangorestframework==3.9.4
djangorestframework==3.12.2

# zipp 2.0.0 requires Python >= 3.6
zipp==1.0.0
Expand Down
9 changes: 5 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ coverage==5.3.1
# -r requirements/test.in
# coveralls
# pytest-cov
coveralls==2.2.0
coveralls==3.0.0
# via -r requirements/travis.in
cryptography==3.2.1
# via
Expand Down Expand Up @@ -76,12 +76,13 @@ django==2.2.17
# django-fernet-fields
# django-model-utils
# django-storages
# djangorestframework
# drf-jwt
# edx-django-utils
# edx-drf-extensions
# edx-toggles
# rest-condition
djangorestframework==3.9.4
djangorestframework==3.12.2
# via
# -c requirements/constraints.txt
# drf-jwt
Expand All @@ -97,7 +98,7 @@ edx-django-utils==3.13.0
# via
# edx-drf-extensions
# edx-toggles
edx-drf-extensions==6.2.0
edx-drf-extensions==6.3.0
# via -r requirements/base.in
edx-lint==1.6
# via -r requirements/quality.in
Expand Down Expand Up @@ -187,7 +188,7 @@ pycryptodomex==3.9.9
# via pyjwkest
pydocstyle==5.1.1
# via -r requirements/quality.in
pygments==2.7.3
pygments==2.7.4
# via
# diff-cover
# readme-renderer
Expand Down
7 changes: 4 additions & 3 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,13 @@ django==2.2.17
# django-fernet-fields
# django-model-utils
# django-storages
# djangorestframework
# drf-jwt
# edx-django-utils
# edx-drf-extensions
# edx-toggles
# rest-condition
djangorestframework==3.9.4
djangorestframework==3.12.2
# via
# -c requirements/constraints.txt
# drf-jwt
Expand All @@ -85,7 +86,7 @@ edx-django-utils==3.13.0
# via
# edx-drf-extensions
# edx-toggles
edx-drf-extensions==6.2.0
edx-drf-extensions==6.3.0
# via -r requirements/base.in
edx-lint==1.6
# via -r requirements/quality.in
Expand Down Expand Up @@ -151,7 +152,7 @@ pycryptodomex==3.9.9
# via pyjwkest
pydocstyle==5.1.1
# via -r requirements/quality.in
pygments==2.7.3
pygments==2.7.4
# via readme-renderer
pyjwkest==1.4.2
# via edx-drf-extensions
Expand Down
5 changes: 3 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ django-waffle==2.0.0
# django-fernet-fields
# django-model-utils
# django-storages
# djangorestframework
# drf-jwt
# edx-django-utils
# edx-drf-extensions
# edx-toggles
# rest-condition
djangorestframework==3.9.4
djangorestframework==3.12.2
# via
# -c requirements/constraints.txt
# drf-jwt
Expand All @@ -71,7 +72,7 @@ edx-django-utils==3.13.0
# via
# edx-drf-extensions
# edx-toggles
edx-drf-extensions==6.2.0
edx-drf-extensions==6.3.0
# via -r requirements/base.in
edx-opaque-keys==2.1.1
# via edx-drf-extensions
Expand Down
2 changes: 1 addition & 1 deletion requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chardet==4.0.0
# via requests
coverage==5.3.1
# via coveralls
coveralls==2.2.0
coveralls==3.0.0
# via -r requirements/travis.in
distlib==0.3.1
# via virtualenv
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def load_requirements(*requirements_paths):
return list(requirements)


VERSION = '1.4.5'
VERSION = '1.4.6'

if sys.argv[-1] == 'tag':
print("Tagging the version on github:")
Expand Down

0 comments on commit 5062d5a

Please sign in to comment.