From 0085d15d624a44bb355f7dc7fddfb174f63021ea Mon Sep 17 00:00:00 2001 From: RobertHWChiangSV Date: Wed, 19 Dec 2018 15:39:10 +0800 Subject: [PATCH 1/2] test --- testsapp/requirements.txt | 3 +-- tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testsapp/requirements.txt b/testsapp/requirements.txt index 6513ae3..95174bb 100644 --- a/testsapp/requirements.txt +++ b/testsapp/requirements.txt @@ -1,5 +1,4 @@ pytest -pytest-django pytest-cov boto -south \ No newline at end of file +south diff --git a/tox.ini b/tox.ini index d77ba72..64b25f4 100644 --- a/tox.ini +++ b/tox.ini @@ -17,11 +17,17 @@ basepython = deps = -rtestsapp/requirements.txt dj14: django>=1.4,<1.4.999 + dj14: pytest-django==2.9.1 dj15: django>=1.5,<1.5.999 + dj15: pytest-django==2.9.1 dj16: django>=1.6,<1.6.999 + dj16: pytest-django==2.9.1 dj17: django>=1.7,<1.7.999 + dj17: pytest-django==2.9.1 dj18: django>=1.8,<1.8.999 - dj19: https://github.com/django/django/archive/master.tar.gz#egg=django + dj18: pytest-django==2.9.1 + dj19: django>=1.9,<1.9.999 + dj19: pytest-django==2.9.1 setenv = DJANGO_SETTINGS_MODULE = testsapp.tests_settings PYTHONPATH = {toxinidir}/testsapp:{toxinidir} From c4f43dcaf44df20a1d45c42df5971a0b2b549395 Mon Sep 17 00:00:00 2001 From: RobertHWChiangSV Date: Wed, 19 Dec 2018 16:10:45 +0800 Subject: [PATCH 2/2] test --- testsapp/requirements.txt | 3 ++- tox.ini | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/testsapp/requirements.txt b/testsapp/requirements.txt index 95174bb..0fcad0f 100644 --- a/testsapp/requirements.txt +++ b/testsapp/requirements.txt @@ -1,4 +1,5 @@ -pytest +pytest==2.9.0 +pytest-django==2.9.1 pytest-cov boto south diff --git a/tox.ini b/tox.ini index 64b25f4..25e013b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] # for py 3.x we are using only django 1.6.x as 1.5.x had only "experimental py3 support" envlist = - py{27,py}-dj{14,15,16,17,18}, - py{33,34}-dj{15,16,17,18}, + py{27,py}-dj{14,15,16,17,18,19}, + py{33,34}-dj{15,16,17,18,19}, py27-cov skipsdist = True usedevelop = True @@ -17,17 +17,11 @@ basepython = deps = -rtestsapp/requirements.txt dj14: django>=1.4,<1.4.999 - dj14: pytest-django==2.9.1 dj15: django>=1.5,<1.5.999 - dj15: pytest-django==2.9.1 dj16: django>=1.6,<1.6.999 - dj16: pytest-django==2.9.1 dj17: django>=1.7,<1.7.999 - dj17: pytest-django==2.9.1 dj18: django>=1.8,<1.8.999 - dj18: pytest-django==2.9.1 dj19: django>=1.9,<1.9.999 - dj19: pytest-django==2.9.1 setenv = DJANGO_SETTINGS_MODULE = testsapp.tests_settings PYTHONPATH = {toxinidir}/testsapp:{toxinidir}