From dee3f78cb688b1bee892ef78d6eec23ccf67a80e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 26 Sep 2014 17:06:20 +0100 Subject: FileField and ImageField --- tox.ini | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d40a7079..5b9a0ffe 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,6 @@ basepython = python3.4 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.3-django1.7] @@ -29,7 +28,6 @@ basepython = python3.3 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.2-django1.7] @@ -37,7 +35,6 @@ basepython = python3.2 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.7] @@ -49,7 +46,6 @@ deps = Django==1.7 # oauth2==1.5.211 # django-oauth2-provider==0.2.4 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.4-django1.6] @@ -57,7 +53,6 @@ basepython = python3.4 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.3-django1.6] @@ -65,7 +60,6 @@ basepython = python3.3 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.2-django1.6] @@ -73,7 +67,6 @@ basepython = python3.2 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.6] @@ -85,7 +78,6 @@ deps = Django==1.6.3 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.6-django1.6] @@ -97,7 +89,6 @@ deps = Django==1.6.3 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.4-django1.5] @@ -105,7 +96,6 @@ basepython = python3.4 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.3-django1.5] @@ -113,7 +103,6 @@ basepython = python3.3 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.2-django1.5] @@ -121,7 +110,6 @@ basepython = python3.2 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.5] @@ -133,7 +121,6 @@ deps = django==1.5.6 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.6-django1.5] @@ -145,7 +132,6 @@ deps = django==1.5.6 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.4] @@ -157,7 +143,6 @@ deps = django==1.4.11 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.6-django1.4] @@ -169,5 +154,4 @@ deps = django==1.4.11 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 -- cgit v1.2.3 From 8af3d5db492c7468a1f2e4befdcd78b59216241d Mon Sep 17 00:00:00 2001 From: José Padilla Date: Tue, 28 Oct 2014 16:58:25 -0400 Subject: Use PYTHONDONTWRITEBYTECODE=1 on tox environment This fixes bad marshal data errors after running tests with tox and later running tests manually via runtests.py. Fixes #1957--- tox.ini | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d40a7079..b3f53cce 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,8 @@ envlist = [testenv] commands = ./runtests.py --fast +setenv = + PYTHONDONTWRITEBYTECODE=1 [testenv:flake8] basepython = python2.7 -- cgit v1.2.3 From b001a146d73348af18cfc4c943d87f2f389349c9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 17 Nov 2014 09:56:20 +0000 Subject: Add django master to build matrix. Closes #2075. --- tox.ini | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index d52dd155..493712a1 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,8 @@ envlist = py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4 + py2.7-django1.4,py2.6-django1.4, + py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster [testenv] commands = ./runtests.py --fast @@ -157,3 +158,24 @@ deps = django==1.4.11 django-oauth2-provider==0.2.3 django-guardian==1.2.3 pytest-django==2.6.1 + +[testenv:py3.4-djangomaster] +basepython = python3.4 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py3.3-djangomaster] +basepython = python3.3 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py2.7-djangomaster] +basepython = python3.2 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 -- cgit v1.2.3 From 585054f0120b9c73c8158a92466f8959ff7f932e Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin Date: Tue, 25 Nov 2014 10:57:46 +0100 Subject: Streamlined tox config with 1.8 features --- tox.ini | 191 +++++++--------------------------------------------------------- 1 file changed, 21 insertions(+), 170 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 493712a1..b6d94678 100644 --- a/tox.ini +++ b/tox.ini @@ -1,181 +1,32 @@ [tox] -downloadcache = {toxworkdir}/cache/ envlist = - flake8, - py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, - py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, - py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4, - py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster + py27-flake8, + {py26,py27}-django1.4, + {py26,py27,py32,py33,py34}-django{1.5,1.6}, + {py27,py32,py33,py34}-django1.7, + {py27,py33,py34}-djangomaster [testenv] commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 - -[testenv:flake8] -basepython = python2.7 -deps = pytest==2.5.2 - flake8==2.2.2 -commands = ./runtests.py --lintonly - -[testenv:py3.4-django1.7] -basepython = python3.4 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-django1.7] -basepython = python3.3 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 +deps = + django1.4: django==1.4.11 + django1.5: django==1.5.6 + django1.6: Django==1.6.3 + django1.7: Django==1.7 + djangomaster: https://github.com/django/django/zipball/master + {py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3 + {py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211 + {py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1 + {py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3 + {py26,py27}-django1.6: django-oauth2-provider==0.2.4 pytest-django==2.6.1 - -[testenv:py3.2-django1.7] -basepython = python3.2 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.7] -basepython = python2.7 -deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - # django-oauth-plus==2.2.1 - # oauth2==1.5.211 - # django-oauth2-provider==0.2.4 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py3.4-django1.6] -basepython = python3.4 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 -[testenv:py3.3-django1.6] -basepython = python3.3 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.2-django1.6] -basepython = python3.2 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.6] -basepython = python2.7 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.6-django1.6] -basepython = python2.6 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py3.4-django1.5] -basepython = python3.4 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-django1.5] -basepython = python3.3 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.2-django1.5] -basepython = python3.2 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.5] -basepython = python2.7 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.6-django1.5] -basepython = python2.6 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.4] -basepython = python2.7 -deps = django==1.4.11 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.6-django1.4] -basepython = python2.6 -deps = django==1.4.11 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py3.4-djangomaster] -basepython = python3.4 -deps = https://github.com/django/django/zipball/master - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-djangomaster] -basepython = python3.3 -deps = https://github.com/django/django/zipball/master - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-djangomaster] -basepython = python3.2 -deps = https://github.com/django/django/zipball/master - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 +[testenv:py27-flake8] +deps = + pytest==2.5.2 + flake8==2.2.2 +commands = ./runtests.py --lintonly -- cgit v1.2.3 From b6de2660eaa19dbd656215f47b6d24a5cc8bb5b3 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin Date: Tue, 25 Nov 2014 11:09:36 +0100 Subject: Added python 3.2 to test against django master . Related to #2075. --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index b6d94678..b1e03580 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,7 @@ envlist = py27-flake8, {py26,py27}-django1.4, {py26,py27,py32,py33,py34}-django{1.5,1.6}, - {py27,py32,py33,py34}-django1.7, - {py27,py33,py34}-djangomaster + {py27,py32,py33,py34}-django{1.7,master} [testenv] commands = ./runtests.py --fast -- cgit v1.2.3 From c559ec6da8f983e34ca9a4183e5f632124d77cbc Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin Date: Tue, 25 Nov 2014 12:03:54 +0100 Subject: Removed dots in Django versions in tox. Refs #2124. --- tox.ini | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index b1e03580..a7200a3f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,25 +1,25 @@ [tox] envlist = py27-flake8, - {py26,py27}-django1.4, - {py26,py27,py32,py33,py34}-django{1.5,1.6}, - {py27,py32,py33,py34}-django{1.7,master} + {py26,py27}-django14, + {py26,py27,py32,py33,py34}-django{15,16}, + {py27,py32,py33,py34}-django{17,master} [testenv] commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django1.4: django==1.4.11 - django1.5: django==1.5.6 - django1.6: Django==1.6.3 - django1.7: Django==1.7 + django14: django==1.4.11 + django15: django==1.5.6 + django16: Django==1.6.3 + django17: Django==1.7 djangomaster: https://github.com/django/django/zipball/master - {py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3 - {py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211 - {py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1 - {py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3 - {py26,py27}-django1.6: django-oauth2-provider==0.2.4 + {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 + {py26,py27}-django{14,15,16}: oauth2==1.5.211 + {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1 + {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 + {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.6.1 django-filter==0.7 defusedxml==0.3 -- cgit v1.2.3 From 04abe9830c1b6c0670a49129529e8e8d9e411f2c Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 22 Oct 2014 21:22:16 +0100 Subject: Add a docs build to the Tox run --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a7200a3f..6b680813 100644 --- a/tox.ini +++ b/tox.ini @@ -29,3 +29,8 @@ deps = pytest==2.5.2 flake8==2.2.2 commands = ./runtests.py --lintonly + +[testenv:py27-docs] +deps = + mkdocs>=0.11.1 +commands = mkdocs build -- cgit v1.2.3 From e1b8412eed18e305d7b6338a133b7f6a1270184c Mon Sep 17 00:00:00 2001 From: José Padilla Date: Tue, 25 Nov 2014 09:22:29 -0400 Subject: Add markdown and PyYAML to tox test requirements --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index a7200a3f..b33c0700 100644 --- a/tox.ini +++ b/tox.ini @@ -23,6 +23,8 @@ deps = pytest-django==2.6.1 django-filter==0.7 defusedxml==0.3 + markdown>=2.1.0 + PyYAML>=3.10 [testenv:py27-flake8] deps = -- cgit v1.2.3 From fceeecf1e229de5ecf8930d3aacf4ef914d50b20 Mon Sep 17 00:00:00 2001 From: José Padilla Date: Thu, 27 Nov 2014 09:06:37 -0400 Subject: Update to latest minor Django versions --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 11ea17b9..d5cb9ef9 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,10 @@ commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django14: django==1.4.11 - django15: django==1.5.6 - django16: Django==1.6.3 - django17: Django==1.7 + django14: Django==1.4.16 + django15: Django==1.5.11 + django16: Django==1.6.8 + django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 -- cgit v1.2.3