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

Add compatibility for Django 4.1 and Python 3.10 #332

Merged
merged 3 commits into from
Dec 8, 2022
Merged

Add compatibility for Django 4.1 and Python 3.10 #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a81b56d
Add compatibility for Django 4.1
browniebroke Dec 6, 2022
c18993f
Add support for Python 3.10
browniebroke Dec 6, 2022
7a1d1ca
Don't submit coverage if env varibale is unset
browniebroke Dec 6, 2022
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
55 changes: 52 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,18 @@ workflows:
- test-3.8-31
- test-3.8-32
- test-3.8-40
- test-3.8-41

- test-3.9-22
- test-3.9-30
- test-3.9-31
- test-3.9-32
- test-3.9-40
- test-3.9-41

- test-3.10-32
- test-3.10-40
- test-3.10-41

- done:
requires:
Expand All @@ -42,12 +48,18 @@ workflows:
- test-3.8-31
- test-3.8-32
- test-3.8-40
- test-3.8-41

- test-3.9-22
- test-3.9-30
- test-3.9-31
- test-3.9-32
- test-3.9-40
- test-3.9-41

- test-3.10-32
- test-3.10-40
- test-3.10-41

jobs:
base: &test-template
Expand Down Expand Up @@ -94,7 +106,10 @@ jobs:
source venv/bin/activate
cd tests
coverage run --source=webpack_loader manage.py test
coveralls
if [ "$COVERALLS_REPO_TOKEN" != "" ]
then
coveralls
fi
Comment on lines +109 to +112
Copy link
Contributor Author

@browniebroke browniebroke Dec 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

To work around #292

Not an ideal fix, feel free to remove if you have a better idea

environment:
COVERALLS_PARALLEL: 1

Expand Down Expand Up @@ -178,6 +193,12 @@ jobs:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "40"
test-3.8-41:
<<: *test-template
docker:
- image: circleci/python:3.8-buster-node
environment:
DJANGO_VERSION: "41"

test-3.9-22:
<<: *test-template
Expand Down Expand Up @@ -209,6 +230,31 @@ jobs:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "40"
test-3.9-41:
<<: *test-template
docker:
- image: circleci/python:3.9-buster-node
environment:
DJANGO_VERSION: "41"

test-3.10-32:
<<: *test-template
docker:
- image: circleci/python:3.10-buster-node
environment:
DJANGO_VERSION: "32"
test-3.10-40:
<<: *test-template
docker:
- image: circleci/python:3.10-buster-node
environment:
DJANGO_VERSION: "40"
test-3.10-41:
<<: *test-template
docker:
- image: circleci/python:3.10-buster-node
environment:
DJANGO_VERSION: "41"

done:
docker:
Expand All @@ -217,5 +263,8 @@ jobs:
- run:
name: Finish Coveralls
command: |
pip install coveralls
coveralls --finish
if [ "$COVERALLS_REPO_TOKEN" != "" ]
then
pip install coveralls
coveralls --finish
fi
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def rel(*parts):
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Framework :: Django',
'Framework :: Django :: 2.0',
'Framework :: Django :: 2.1',
Expand All @@ -43,6 +44,7 @@ def rel(*parts):
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Environment :: Web Environment',
'License :: OSI Approved :: MIT License',
],
Expand Down
1 change: 1 addition & 0 deletions tests/requirements/django41.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django>=4.1,<4.2