Skip to content

Commit

Permalink
Merge pull request #173 from valberg/churn/add_django_4_to_tests
Browse files Browse the repository at this point in the history
Add django 4.0 and python 3.9/3.10 to test matrix.
  • Loading branch information
valberg committed Mar 30, 2022
2 parents f68d3a3 + c521475 commit 34a3de3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Expand Up @@ -9,8 +9,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.5', '3.6', '3.7', '3.8']
django-version: ['1.1', '2.2', '3.2']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
django-version: ['3.2', '4.0']

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -48,4 +48,4 @@ jobs:
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
name: Python ${{ matrix.python-version }}
name: Python ${{ matrix.python-version }}
14 changes: 6 additions & 8 deletions tox.ini
@@ -1,21 +1,20 @@
[gh-actions]
python =
3.5: py35
3.6: py36
3.7: py37
3.8: py38, flake8
3.9: py39
3.10: py310

[gh-actions:env]
DJANGO =
1.1: django111
2.2: django22
3.2: django32
4.0: django40

[tox]
envlist =
py{35,36,37}-django111-backendBasic
py35-django22-backendAllauth
py{36,37,38}-django32-backend{Basic,Allauth}
py{36,37,38,39,310}-django{32}-backend{Basic,Allauth}
py{38,39,310}-django{40}-backend{Basic,Allauth}
flake8

[pytest]
Expand All @@ -27,9 +26,8 @@ setenv =
PYTHONWARNINGS = all
deps =
-r requirements.txt
django111: Django>=1.11.17,<2.0
django22: Django>=2.2.6,<3.0
django32: Django>=3.2,<3.3
django40: Django>=4.0,<4.1
backendAllauth: django-allauth
commands =
python -V
Expand Down

0 comments on commit 34a3de3

Please sign in to comment.