From 27159f45b36ab180710b66e617b264a756952526 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 26 Nov 2017 22:14:25 +0200 Subject: [PATCH 1/4] Drop support for EOL Python 2.6 --- .travis.yml | 1 - setup.py | 1 - tox.ini | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a66809..1e79765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - "3.4" env: - - TOX_ENV=py26 - TOX_ENV=py27 - TOX_ENV=py33 - TOX_ENV=py34 diff --git a/setup.py b/setup.py index 18a4fae..0f032de 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,6 @@ setup( "Topic :: Software Development :: Libraries :: Python Modules", "Programming Language :: Python", "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.3", diff --git a/tox.ini b/tox.ini index 50b4a74..c0206c0 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py26, py27, py33, py34 +envlist = py27, py33, py34 [testenv] deps=pytest From f74adc6893ad203919337d6fe4ce58a9df034d13 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 26 Nov 2017 22:20:57 +0200 Subject: [PATCH 2/4] Drop support for EOL Python 3.3 --- .travis.yml | 1 - setup.py | 1 - tox.ini | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e79765..e34557a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ python: env: - TOX_ENV=py27 - - TOX_ENV=py33 - TOX_ENV=py34 install: diff --git a/setup.py b/setup.py index 0f032de..bcc6209 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,6 @@ setup( "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", ], diff --git a/tox.ini b/tox.ini index c0206c0..7388ac4 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py33, py34 +envlist = py27, py34 [testenv] deps=pytest From 4172699812cd2a80f48a46fff994344e220b0be8 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 26 Nov 2017 22:23:31 +0200 Subject: [PATCH 3/4] Add Python 3.5 and 3.6 --- .travis.yml | 4 +++- setup.py | 2 ++ tox.ini | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e34557a..5bdf1d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,13 @@ language: python python: - - "3.4" + - "3.6" env: - TOX_ENV=py27 - TOX_ENV=py34 + - TOX_ENV=py35 + - TOX_ENV=py36 install: - travis_retry pip install -U pip wheel tox diff --git a/setup.py b/setup.py index bcc6209..c3d7362 100755 --- a/setup.py +++ b/setup.py @@ -41,6 +41,8 @@ setup( "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", ], ) diff --git a/tox.ini b/tox.ini index 7388ac4..b29c95e 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py34 +envlist = py27, py34, py35, py36 [testenv] deps=pytest From f4a04732fd2a3519ec4a3c1f66e669a20f1a2275 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 26 Nov 2017 22:26:41 +0200 Subject: [PATCH 4/4] Workaround for py35 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5bdf1d4..b0ebc5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,10 @@ env: - TOX_ENV=py35 - TOX_ENV=py36 +before_install: + # work around https://github.com/travis-ci/travis-ci/issues/8363 + - pyenv global system 3.5 + install: - travis_retry pip install -U pip wheel tox - travis_retry pip install -U -r requirements.txt -e .