summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshley Camba Garrido <ashwoods@gmail.com>2018-06-12 22:55:20 +0200
committerAshley Camba Garrido <ashwoods@gmail.com>2018-06-12 22:55:20 +0200
commit184e334294415b78f2824a541ec4d5997645f21c (patch)
tree391e5501e200a7d148ad57450044074b050a49a3
parent4b5344383f662fa7e7ea04118563707937c4378e (diff)
downloadraven-184e334294415b78f2824a541ec4d5997645f21c.tar.gz
fix: Adapt django builds with new django-pytest release
-rw-r--r--tox.ini11
1 files changed, 6 insertions, 5 deletions
diff --git a/tox.ini b/tox.ini
index 4eb40e2..284383c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,9 @@ envlist =
pypy
flake8
# contrib
- {py35,py36}-django-dev-fix
- {py35,py36}-django-{200}-fix
- {py27,py35}-django-111-fix
+ {py35,py36}-django-dev
+ {py35,py36}-django-{200}
+ {py27,py35}-django-111
{py27,py34,py35}-django-{18,19,110}
{py27,py34,py35}-django-18
{py27,py34}-django-17
@@ -29,7 +29,7 @@ envlist =
deps =
py27: gevent
django-{16,17,18}: pytest-django<3.0
- django-{19,110,110}: pytest-django>=3.0
+ django-{19,110,110,111,200,dev}: pytest-django>=3.0
django-{18,19,110}: django-tastypie==0.14
django-16: Django>=1.6,<1.7
django-17: Django>=1.7,<1.8
@@ -48,10 +48,11 @@ deps =
celery-4: Celery>=4.0,<4.1
sanic-07: sanic>=0.7,<0.8
sanic-07: aiohttp
- fix: git+https://github.com/pytest-dev/pytest-django.git#egg=pytest_django
+ # fix: git+https://github.com/pytest-dev/pytest-django.git#egg=pytest_django
setenv =
PYTHONDONTWRITEBYTECODE=1
TESTPATH=tests
+ DJANGO_SETTINGS_MODULE=tests.contrib.django.settings
django: TESTPATH=tests/contrib/django
flask: TESTPATH=tests/contrib/flask
sanic: TESTPATH=tests/contrib/sanic