Skip to content

Commit

Permalink
Merge pull request #137 from edx/jawayria/django32_support
Browse files Browse the repository at this point in the history
feat: Added support for django3.2
  • Loading branch information
Jawayria authored Aug 4, 2021
2 parents de02b09 + 379359f commit 4fc18f9
Show file tree
Hide file tree
Showing 15 changed files with 729 additions and 219 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ env:
- TOXENV=quality
- TOXENV=docs
- TOXENV=django22-drf312
- TOXENV=django22-drflatest
- TOXENV=django30-drf312
- TOXENV=django31-drf312
- TOXENV=django32-drf312
- TOXENV=django32-drflatest
install:
- pip install -r requirements/travis.txt
script:
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

-c constraints.txt

Django>=1.11,<2.3
Django
django-model-utils>=2.3.1

jsonfield2
Expand Down
29 changes: 22 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
django-model-utils==4.1.0 # via -r requirements/base.in
django==2.2.17 # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, djangorestframework, jsonfield2
djangorestframework==3.12.2 # via -r requirements/base.in
jsonfield2==3.0.3 # via -c requirements/constraints.txt, -r requirements/base.in
pytz==2020.5 # via -r requirements/base.in, django
sqlparse==0.4.1 # via django
django==2.2.24
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-model-utils
# djangorestframework
# jsonfield2
django-model-utils==4.1.1
# via -r requirements/base.in
djangorestframework==3.12.4
# via -r requirements/base.in
jsonfield2==3.0.3
# via
# -c requirements/constraints.txt
# -r requirements/base.in
pytz==2021.1
# via
# -r requirements/base.in
# django
sqlparse==0.4.1
# via django
Loading

0 comments on commit 4fc18f9

Please sign in to comment.