Skip to content

Commit

Permalink
fix: Add django 4.2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Salman Nawaz authored and Salman Nawaz committed Aug 2, 2023
1 parent 400fc44 commit 4fe8bc7
Show file tree
Hide file tree
Showing 14 changed files with 279 additions and 307 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
matrix:
os: [ ubuntu-20.04 ]
python-version: [ '3.8' ]
toxenv: [django32, quality ]
toxenv: [django32, django42, quality]
steps:
- uses: actions/checkout@v2
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
pip-compile --upgrade -o requirements/dev.txt requirements/base.in requirements/dev.in requirements/quality.in requirements/test.in requirements/travis.in
pip-compile --upgrade -o requirements/quality.txt requirements/base.in requirements/quality.in requirements/test.in
pip-compile --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
# Let tox control the Django version for tests
grep -e "^django==" requirements/test.txt > requirements/django.txt
Expand Down
47 changes: 24 additions & 23 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,69 +1,70 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
asgiref==3.5.2
asgiref==3.7.2
# via django
certifi==2022.9.24
certifi==2023.7.22
# via requests
charset-normalizer==2.1.1
charset-normalizer==3.2.0
# via requests
coverage==6.5.0
# via coveralls
coveralls==3.3.1
# via -r requirements/ci.in
distlib==0.3.6
distlib==0.3.7
# via virtualenv
django==3.2.16
django==3.2.20
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# edx-i18n-tools
docopt==0.6.2
# via coveralls
edx-i18n-tools==0.9.2
edx-i18n-tools==1.0.0
# via -r requirements/ci.in
filelock==3.8.0
filelock==3.12.2
# via
# tox
# virtualenv
idna==3.4
# via requests
packaging==21.3
packaging==23.1
# via tox
path==16.5.0
path==16.7.1
# via edx-i18n-tools
platformdirs==2.5.2
platformdirs==3.10.0
# via virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via tox
polib==1.1.1
polib==1.2.0
# via edx-i18n-tools
py==1.11.0
# via tox
pyparsing==3.0.9
# via packaging
pytz==2022.5
pytz==2023.3
# via django
pyyaml==6.0
pyyaml==6.0.1
# via edx-i18n-tools
requests==2.28.1
requests==2.31.0
# via coveralls
six==1.16.0
# via tox
sqlparse==0.4.3
sqlparse==0.4.4
# via django
tomli==2.0.1
# via tox
tox==3.26.0
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.12
typing-extensions==4.7.1
# via asgiref
urllib3==2.0.4
# via requests
virtualenv==20.16.5
virtualenv==20.24.2
# via tox
8 changes: 4 additions & 4 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Django<4.0
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
elasticsearch<7.14.0

# setuptools==60.0 had breaking changes and busted several service's pipeline.
# Details can be found here: https://github.com/pypa/setuptools/issues/2940
setuptools<60

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
2 changes: 2 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@

# Use latest Django LTS version
Django<3.3.0

pylint==2.12.2
Loading

0 comments on commit 4fe8bc7

Please sign in to comment.