From c8ab738630e2e6d60a6a10fb3937e15b0e82148d Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Thu, 13 Aug 2015 15:30:07 +1000 Subject: [PATCH 1/2] tox: Remove py32-django-master and py33-django-master (py35 can be added later when that is released), as Django will no longer support them upstream: https://docs.djangoproject.com/en/1.8/faq/install/#what-python-version-can-i-use-with-django --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 765c35ab..0be9fb5d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,8 @@ [tox] args_are_paths = false -envlist = {py27,py32,py33,py34}-django-{17,18,master} +envlist = + {py27,py34}-django-{17,18,master} + {py32,py33}-django-{17,18} [testenv] basepython = From e046a5724f508d40296cd7e185b3bd888a58b01c Mon Sep 17 00:00:00 2001 From: Peter Schmidt Date: Thu, 13 Aug 2015 15:33:38 +1000 Subject: [PATCH 2/2] Also remove from Travis. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2e458ea..d4a82dab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,8 @@ env: - TOXENV=py27-django-master - TOXENV=py32-django-17 - TOXENV=py32-django-18 - - TOXENV=py32-django-master - TOXENV=py33-django-17 - TOXENV=py33-django-18 - - TOXENV=py33-django-master - TOXENV=py34-django-17 - TOXENV=py34-django-18 - TOXENV=py34-django-master