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.

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

update CI with django 4.0 #272

Merged
merged 3 commits into from Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/test.yaml
Expand Up @@ -14,10 +14,12 @@ jobs:
strategy:
matrix:
python-version: [ 3.7, 3.8, 3.9, "3.10" ]
django: [ 22, 31, 32 ]
django: [ 22, 32, 40 ]
exclude:
- python-version: "3.10"
django: 22
- python-version: 3.7
django: 40
services:
postgres:
image: postgres
Expand Down
1 change: 0 additions & 1 deletion requirements/test-django31.txt

This file was deleted.

1 change: 1 addition & 0 deletions requirements/test-django40.txt
@@ -0,0 +1 @@
django>=4.0,<4.1
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -43,8 +43,8 @@ def _pyimp():
Programming Language :: Python :: Implementation :: PyPy
Framework :: Django
Framework :: Django :: 2.2
Framework :: Django :: 3.1
Framework :: Django :: 3.2
Framework :: Django :: 4.0
Operating System :: OS Independent
Topic :: Communications
Topic :: System :: Distributed Computing
Expand Down
15 changes: 7 additions & 8 deletions tox.ini
@@ -1,11 +1,10 @@
[tox]
envlist =
py310-django{31,32}
py39-django{22,31,32}
py38-django{22,31,32}
py37-django{22,31,32}
py36-django{22,31,32}
pypy3-django{22,31,32}
py310-django{40,32}
py39-django{22,40,32}
py38-django{22,40,32}
py37-django{22,32}
pypy3-django{22,32}

flake8
flakeplus
Expand All @@ -17,7 +16,7 @@ envlist =
[travis:env]
DJANGO =
2.2: django22
3.1: django31
4.0: django40
3.2: django32

[testenv]
Expand All @@ -27,7 +26,7 @@ deps=
-r{toxinidir}/requirements/test-ci.txt

django22: -r{toxinidir}/requirements/test-django22.txt
django31: -r{toxinidir}/requirements/test-django31.txt
django40: -r{toxinidir}/requirements/test-django40.txt
django32: -r{toxinidir}/requirements/test-django32.txt

cov,integration: -r{toxinidir}/requirements/test-django.txt
Expand Down