Skip to content

test: Add Django 3.1 to test matrix #776

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

Merged
untitaker merged 5 commits into from
Aug 6, 2020
Merged

test: Add Django 3.1 to test matrix #776

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c8a6e5
test: Add Django 3.1 to test matrix
untitaker Aug 4, 2020
8369351
refactor test matrix
untitaker Aug 4, 2020
26172ca
fix toxfile
untitaker Aug 4, 2020
6fdd65c
fix again
untitaker Aug 4, 2020
f424bb1
scope down pure_eval integration
untitaker Aug 4, 2020
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
20 changes: 12 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ envlist =
{pypy,py2.7}-django-{1.6,1.7}
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
{py3.7,py3.8}-django-{2.2,3.0,dev}
{py3.7,py3.8}-django-{2.2,3.0,3.1,dev}

{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-flask-{1.1,1.0,0.11,0.12}
{py3.6,py3.7,py3.8}-flask-{1.1,1.0,0.11,0.12,dev}
Expand Down Expand Up @@ -70,19 +70,19 @@ envlist =

py3.7-spark

{py3.5,py3.6,py3.7,py3.8}-pure_eval

[testenv]
deps =
-r test-requirements.txt

py3.{5,6,7,8}: pure_eval

django-{1.11,2.0,2.1,2.2,3.0,dev}: djangorestframework>=3.0.0,<4.0.0
{py3.7,py3.8}-django-{1.11,2.0,2.1,2.2,3.0,dev}: channels>2
{py3.7,py3.8}-django-{1.11,2.0,2.1,2.2,3.0,dev}: pytest-asyncio==0.10.0
{py2.7,py3.7,py3.8}-django-{1.11,2.2,3.0,dev}: psycopg2-binary
django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
{py3.7,py3.8}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: channels>2
{py3.7,py3.8}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: pytest-asyncio==0.10.0
{py2.7,py3.7,py3.8}-django-{1.11,2.2,3.0,3.1,dev}: psycopg2-binary

django-{1.6,1.7,1.8}: pytest-django<3.0
django-{1.9,1.10,1.11,2.0,2.1,2.2,3.0,dev}: pytest-django>=3.0
django-{1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1,dev}: pytest-django>=3.0

django-1.6: Django>=1.6,<1.7
django-1.7: Django>=1.7,<1.8
Expand All @@ -94,6 +94,7 @@ deps =
django-2.1: Django>=2.1,<2.2
django-2.2: Django>=2.2,<2.3
django-3.0: Django>=3.0,<3.1
django-3.1: Django>=3.1,<3.2
django-dev: git+https://github.com/django/django.git#egg=Django

flask: flask-login
Expand Down Expand Up @@ -186,6 +187,8 @@ deps =

py3.8: hypothesis

pure_eval: pure_eval

setenv =
PYTHONDONTWRITEBYTECODE=1
TESTPATH=tests
Expand All @@ -208,6 +211,7 @@ setenv =
asgi: TESTPATH=tests/integrations/asgi
sqlalchemy: TESTPATH=tests/integrations/sqlalchemy
spark: TESTPATH=tests/integrations/spark
pure_eval: TESTPATH=tests/integrations/pure_eval

COVERAGE_FILE=.coverage-{envname}
passenv =
Expand Down