Skip to content

Commit 2faba9f

Browse files
committed
feat: drop Python 2.6/3.3 official support, add 3.5/3.6 testing
Closes #441
1 parent 3495442 commit 2faba9f

3 files changed

Lines changed: 12 additions & 29 deletions

File tree

.travis.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,6 @@ matrix:
1414
exclude:
1515
- python: '2.7'
1616
include:
17-
- python: '2.6'
18-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
19-
- python: '2.6'
20-
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26
21-
- python: '2.6'
22-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
23-
- python: '2.6'
24-
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-gevent
25-
- python: '2.6'
26-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
27-
- python: '2.6'
28-
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-eventlet
2917
- python: '2.7'
3018
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
3119
- python: '2.7'
@@ -40,14 +28,18 @@ matrix:
4028
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27-eventlet
4129
- python: '2.7'
4230
env: ZOOKEEPER_VERSION=3.5.2-alpha TOX_VENV=py27
43-
- python: '3.3'
44-
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
45-
- python: '3.3'
46-
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py33
4731
- python: '3.4'
4832
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py34
4933
- python: '3.4'
5034
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py34
35+
- python: '3.5'
36+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py35
37+
- python: '3.5'
38+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py35
39+
- python: '3.6'
40+
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py36
41+
- python: '3.6'
42+
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py36
5143
- python: pypy
5244
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=pypy
5345
- python: pypy

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
"Operating System :: OS Independent",
5353
"Programming Language :: Python",
5454
"Programming Language :: Python :: 2",
55-
"Programming Language :: Python :: 2.6",
5655
"Programming Language :: Python :: 2.7",
5756
"Programming Language :: Python :: 3",
58-
"Programming Language :: Python :: 3.3",
5957
"Programming Language :: Python :: 3.4",
58+
"Programming Language :: Python :: 3.5",
59+
"Programming Language :: Python :: 3.6",
6060
"Programming Language :: Python :: Implementation :: CPython",
6161
"Programming Language :: Python :: Implementation :: PyPy",
6262
"Topic :: Communications",

tox.ini

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
minversion = 1.6
33
skipsdist = True
44
envlist = pep8,
5-
py26,
6-
py26-gevent,
7-
py26-eventlet,
85
py27,
96
py27-gevent,
107
py27-eventlet,
118
py33,
129
py34,
10+
py35,
11+
py36,
1312
pypy
1413

1514
[testenv:pep8]
@@ -33,14 +32,6 @@ deps = {[testenv]deps}
3332
deps = {[testenv]deps}
3433
-r{toxinidir}/requirements_eventlet.txt
3534

36-
[testenv:py26-gevent]
37-
deps = {[testenv]deps}
38-
-r{toxinidir}/requirements_gevent.txt
39-
40-
[testenv:py26-eventlet]
41-
deps = {[testenv]deps}
42-
-r{toxinidir}/requirements_eventlet.txt
43-
4435
[flake8]
4536
builtins = _
4637
exclude = .venv,.tox,dist,doc,*egg,.git,build,tools

0 commit comments

Comments
 (0)