Skip to content

Commit

Permalink
fix: django 4.2 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Salman Nawaz authored and awais786 committed Jul 31, 2023
1 parent 66ade07 commit 0bb3ba6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 22 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
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
16 changes: 7 additions & 9 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arrow==1.2.3
# via cookiecutter
asgiref==3.7.2
# via django
astroid==2.15.6
astroid==2.9.3
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -61,8 +61,6 @@ ddt==1.6.0
# via -r requirements/test.in
diff-cover==7.7.0
# via -r requirements/dev.in
dill==0.3.7
# via pylint
distlib==0.3.7
# via
# caniusepython3
Expand Down Expand Up @@ -136,7 +134,7 @@ markupsafe==2.1.3
# jinja2
# mako
# xblock
mccabe==0.7.0
mccabe==0.6.1
# via pylint
mock==5.1.0
# via -r requirements/test.in
Expand Down Expand Up @@ -175,8 +173,9 @@ pydocstyle==6.3.0
# via -r requirements/quality.in
pygments==2.15.1
# via diff-cover
pylint==2.17.5
pylint==2.12.2
# via
# -c requirements/constraints.txt
# edx-lint
# pylint-celery
# pylint-django
Expand Down Expand Up @@ -258,17 +257,16 @@ stevedore==5.1.0
# via code-annotations
text-unidecode==1.3
# via python-slugify
toml==0.10.2
# via pylint
tomli==2.0.1
# via
# build
# coverage
# pip-tools
# pylint
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.1
# via pylint
tox==3.28.0
# via
# -c requirements/common_constraints.txt
Expand Down Expand Up @@ -302,7 +300,7 @@ webob==1.8.7
# xblock-sdk
wheel==0.41.0
# via pip-tools
wrapt==1.15.0
wrapt==1.13.3
# via astroid
xblock[django]==1.6.2
# via
Expand Down
16 changes: 7 additions & 9 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arrow==1.2.3
# via cookiecutter
asgiref==3.7.2
# via django
astroid==2.15.6
astroid==2.9.3
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -57,8 +57,6 @@ ddt==1.6.0
# via -r requirements/test.in
diff-cover==7.7.0
# via -r requirements/dev.in
dill==0.3.7
# via pylint
distlib==0.3.7
# via caniusepython3
django==3.2.20
Expand Down Expand Up @@ -121,7 +119,7 @@ markupsafe==2.1.3
# jinja2
# mako
# xblock
mccabe==0.7.0
mccabe==0.6.1
# via pylint
mock==5.1.0
# via -r requirements/test.in
Expand Down Expand Up @@ -150,8 +148,9 @@ pydocstyle==6.3.0
# via -r requirements/quality.in
pygments==2.15.1
# via diff-cover
pylint==2.17.5
pylint==2.12.2
# via
# -c requirements/constraints.txt
# edx-lint
# pylint-celery
# pylint-django
Expand Down Expand Up @@ -230,16 +229,15 @@ stevedore==5.1.0
# via code-annotations
text-unidecode==1.3
# via python-slugify
toml==0.10.2
# via pylint
tomli==2.0.1
# via
# build
# coverage
# pip-tools
# pylint
# pyproject-hooks
# pytest
tomlkit==0.12.1
# via pylint
transifex-client==0.14.4
# via -r requirements/dev.in
typing-extensions==4.7.1
Expand All @@ -264,7 +262,7 @@ webob==1.8.7
# xblock-sdk
wheel==0.41.0
# via pip-tools
wrapt==1.15.0
wrapt==1.13.3
# via astroid
xblock[django]==1.6.2
# via
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32},quality
envlist = py38-django{32, 42},quality

[pycodestyle]
exclude = .git,.tox
Expand All @@ -21,17 +21,17 @@ whitelist_externals =
deps =
django31: Django>=3.1,<3.2
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
passenv =
BOKCHOY_HEADLESS
setenv =
DJANGO_SETTINGS_MODULE = workbench.settings
SCREENSHOT_DIR={toxinidir}/var/logs
SELENIUM_DRIVER_LOG_DIR={toxinidir}/var/logs
commands =
commands =
mkdir -p {toxinidir}/var/logs
rm -rf {toxinidir}/var/logs/*
pytest {posargs}
make validate_translations

[testenv:quality]
Expand Down

0 comments on commit 0bb3ba6

Please sign in to comment.