From 3bfbb1118dc973afee746da359293a77fc2a49c7 Mon Sep 17 00:00:00 2001 From: Emmanouil Konstantinidis Date: Sun, 14 May 2017 12:05:21 +0100 Subject: [PATCH 1/4] Suppor Django 1.11 & Python 3.6 --- .travis.yml | 4 ++++ setup.py | 2 ++ tox.ini | 11 +++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28a66f4..6976c4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,18 +9,22 @@ env: - TOX_ENV=py27-django18 - TOX_ENV=py34-django18 - TOX_ENV=py35-django18 + - TOX_ENV=py36-django18 - TOX_ENV=py27-django19 - TOX_ENV=py34-django19 - TOX_ENV=py35-django19 + - TOX_ENV=py36-django19 - TOX_ENV=py27-django110 - TOX_ENV=py34-django110 - TOX_ENV=py35-django110 + - TOX_ENV=py36-django110 - TOX_ENV=py27-djangomaster - TOX_ENV=py34-djangomaster - TOX_ENV=py35-djangomaster + - TOX_ENV=py36-djangomaster cache: - pip diff --git a/setup.py b/setup.py index 672919c..6bf2f4f 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,8 @@ "Framework :: Django :: 1.7", "Framework :: Django :: 1.8", "Framework :: Django :: 1.9", + "Framework :: Django :: 1.10", + "Framework :: Django :: 1.11", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Programming Language :: Python :: 2.7", diff --git a/tox.ini b/tox.ini index 2909c9d..6098778 100644 --- a/tox.ini +++ b/tox.ini @@ -3,10 +3,11 @@ DJANGO_SETTINGS_MODULE=tests.settings [tox] envlist = - {py27,py34,py35}-django18, - {py27,py34,py35}-django19, - {py27,py34,py35}-django110, - {py27,py34,py35}-django{master} + {py27,py34,py35,py36}-django18, + {py27,py34,py35,py36}-django19, + {py27,py34,py35,py36}-django110, + {py27,py34,py35,py36}-django110, + {py27,py34,py35,py36}-django{master} [testenv] commands = python runtests.py @@ -17,9 +18,11 @@ deps = django18: Django==1.8.14 django19: Django==1.9.9 django110: Django==1.10 + django111: Django==1.11.1 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt basepython = + py36: python3.6 py35: python3.5 py34: python3.4 py27: python2.7 From ef3a09720efaf2fbc708043410016984e93eb681 Mon Sep 17 00:00:00 2001 From: Emmanouil Konstantinidis Date: Sun, 14 May 2017 12:09:55 +0100 Subject: [PATCH 2/4] Add Django 1.11 --- .travis.yml | 5 +++++ tox.ini | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6976c4f..c994a7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ env: - TOX_ENV=py35-django110 - TOX_ENV=py36-django110 + - TOX_ENV=py27-django111 + - TOX_ENV=py34-django111 + - TOX_ENV=py35-django111 + - TOX_ENV=py36-django111 + - TOX_ENV=py27-djangomaster - TOX_ENV=py34-djangomaster - TOX_ENV=py35-djangomaster diff --git a/tox.ini b/tox.ini index 6098778..a1b9557 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ envlist = {py27,py34,py35,py36}-django18, {py27,py34,py35,py36}-django19, {py27,py34,py35,py36}-django110, - {py27,py34,py35,py36}-django110, + {py27,py34,py35,py36}-django111, {py27,py34,py35,py36}-django{master} [testenv] From 2b703f3e3f32ea28223b7e9ba86b2aef2ac71a26 Mon Sep 17 00:00:00 2001 From: Emmanouil Konstantinidis Date: Sun, 14 May 2017 12:37:00 +0100 Subject: [PATCH 3/4] Python 3.6 only for Django 1.11 --- .travis.yml | 3 --- tox.ini | 14 +++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c994a7e..e6cfaab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,17 +9,14 @@ env: - TOX_ENV=py27-django18 - TOX_ENV=py34-django18 - TOX_ENV=py35-django18 - - TOX_ENV=py36-django18 - TOX_ENV=py27-django19 - TOX_ENV=py34-django19 - TOX_ENV=py35-django19 - - TOX_ENV=py36-django19 - TOX_ENV=py27-django110 - TOX_ENV=py34-django110 - TOX_ENV=py35-django110 - - TOX_ENV=py36-django110 - TOX_ENV=py27-django111 - TOX_ENV=py34-django111 diff --git a/tox.ini b/tox.ini index a1b9557..1f0949b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,9 @@ DJANGO_SETTINGS_MODULE=tests.settings [tox] envlist = - {py27,py34,py35,py36}-django18, - {py27,py34,py35,py36}-django19, - {py27,py34,py35,py36}-django110, + {py27,py34,py35}-django18, + {py27,py34,py35}-django19, + {py27,py34,py35}-django110, {py27,py34,py35,py36}-django111, {py27,py34,py35,py36}-django{master} @@ -15,10 +15,10 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.14 - django19: Django==1.9.9 - django110: Django==1.10 - django111: Django==1.11.1 + django18: Django>=1.8,<1.9 + django19: Django>=1.9,<1.10 + django110: Django>=1.10,<1.11 + django111: Django>=1.11,<2.0 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt basepython = From 7018056514783ad472577247262eb813dbfead6a Mon Sep 17 00:00:00 2001 From: Emmanouil Konstantinidis Date: Sun, 14 May 2017 16:02:04 +0100 Subject: [PATCH 4/4] Django master doesn't run on Python 2.7 --- .travis.yml | 3 +-- tox.ini | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6cfaab..6ebf078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: python sudo: false python: - - "3.5" + - "3.6" env: - TOX_ENV=py27-django18 @@ -23,7 +23,6 @@ env: - TOX_ENV=py35-django111 - TOX_ENV=py36-django111 - - TOX_ENV=py27-djangomaster - TOX_ENV=py34-djangomaster - TOX_ENV=py35-djangomaster - TOX_ENV=py36-djangomaster diff --git a/tox.ini b/tox.ini index 1f0949b..be222f1 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = {py27,py34,py35}-django19, {py27,py34,py35}-django110, {py27,py34,py35,py36}-django111, - {py27,py34,py35,py36}-django{master} + {py34,py35,py36}-django{master} [testenv] commands = python runtests.py