Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Django 4.2 support #334

Merged
merged 11 commits into from
Jul 10, 2023
Merged

Add Django 4.2 support #334

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f746b1f
fix: django upgrade 4.2
Jun 26, 2023
c241056
chore: debugging.
awais786 Jun 27, 2023
b08c105
fix: test for integration, quality and translations on django 32,42
Jul 3, 2023
152f98b
fix: update tox env list
UsamaSadiq Jul 3, 2023
bf3933c
fix: update tox envlist
UsamaSadiq Jul 3, 2023
4fcf2db
fix: Update tox.ini
UsamaSadiq Jul 3, 2023
096773a
fix: update tox envlist combinations
UsamaSadiq Jul 4, 2023
d5f2090
fix: split tox envs for integration and translation tests
UsamaSadiq Jul 4, 2023
754f8bb
fix: resolve conflicts
Jul 6, 2023
20d5607
chore: upgrade i18n-tools version
UsamaSadiq Jul 7, 2023
b27f4f7
Merge branch 'master' into salman/django-4.2-upgrade
Agrendalath Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: [3.8]
toxenv: [py38, integration, quality, translations]
toxenv: [django32, django42, integration-django32, integration-django42, quality-django32, quality-django42, translations-django32, translations-django42]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these environments are running unit tests. See the CI logs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking into it.


steps:
- name: checkout repo
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
$(PIP_COMPILE) -o requirements/workbench.txt requirements/workbench.in
$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt

mysql: ## run mysql database for integration tests
docker run --rm -it --name mysql -p 3307:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=db mysql:8
Expand Down
4 changes: 2 additions & 2 deletions requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ bleach[css]==6.0.0
# via -r requirements/test.txt
bok-choy==0.7.1
# via -r requirements/test.txt
boto3==1.26.160
boto3==1.26.161
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.29.160
botocore==1.29.161
# via
# -r requirements/test.txt
# boto3
Expand Down
5 changes: 2 additions & 3 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ bleach[css]==6.0.0
# via -r requirements/base.txt
bok-choy==0.7.1
# via -r requirements/test.in
boto3==1.26.160
boto3==1.26.161
# via fs-s3fs
botocore==1.29.160
botocore==1.29.161
# via
# boto3
# s3transfer
Expand All @@ -40,7 +40,6 @@ coverage[toml]==7.2.7
# via pytest-cov
ddt==1.6.0
# via -r requirements/test.in
django==3.2.19
# via
# -r requirements/base.txt
# django-appconf
Expand Down
11 changes: 10 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38
envlist = py38-django{32,42}, quality-django{32,42}, translations-django{32,42}
UsamaSadiq marked this conversation as resolved.
Show resolved Hide resolved

[pycodestyle]
exclude = .git,.tox
Expand All @@ -20,6 +20,8 @@ allowlist_externals =
make
mkdir
deps =
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
commands =
mkdir -p var
Expand All @@ -30,6 +32,8 @@ allowlist_externals =
make
xvfb-run
deps =
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/workbench.txt
setenv =
PATH = test_helpers/firefox{:}{env:PATH}
Expand All @@ -40,6 +44,8 @@ commands =

[testenv:quality]
deps =
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/quality.txt
commands =
pycodestyle drag_and_drop_v2 tests manage.py setup.py --max-line-length=120
Expand All @@ -50,6 +56,9 @@ commands =
allowlist_externals =
make
deps =
django32: Django>=3.2,<4.0
django42: Django>=4.2,<4.3
-r{toxinidir}/requirements/test.txt
Django>=3.2,<3.3
UsamaSadiq marked this conversation as resolved.
Show resolved Hide resolved
commands =
make check_translations_up_to_date