Merge pull request #443 from python-zk/feat/issue-441
feat: drop Python 2.6/3.3 official support, add 3.5/3.6 testing
This commit is contained in:
commit
b0fbd35782
24
.travis.yml
24
.travis.yml
|
@ -14,18 +14,6 @@ matrix:
|
|||
exclude:
|
||||
- python: '2.7'
|
||||
include:
|
||||
- python: '2.6'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26
|
||||
- python: '2.6'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26
|
||||
- python: '2.6'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
|
||||
- python: '2.6'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-gevent
|
||||
- python: '2.6'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
|
||||
- python: '2.6'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py26-eventlet
|
||||
- python: '2.7'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
|
||||
- python: '2.7'
|
||||
|
@ -40,14 +28,18 @@ matrix:
|
|||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py27-eventlet
|
||||
- python: '2.7'
|
||||
env: ZOOKEEPER_VERSION=3.5.2-alpha TOX_VENV=py27
|
||||
- python: '3.3'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
|
||||
- python: '3.3'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py33
|
||||
- python: '3.4'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py34
|
||||
- python: '3.4'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py34
|
||||
- python: '3.5'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py35
|
||||
- python: '3.5'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py35
|
||||
- python: '3.6'
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py36
|
||||
- python: '3.6'
|
||||
env: ZOOKEEPER_VERSION=3.4.10 TOX_VENV=py36
|
||||
- python: pypy
|
||||
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=pypy
|
||||
- python: pypy
|
||||
|
|
4
setup.py
4
setup.py
|
@ -52,11 +52,11 @@ setup(
|
|||
"Operating System :: OS Independent",
|
||||
"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",
|
||||
"Programming Language :: Python :: 3.4",
|
||||
"Programming Language :: Python :: 3.5",
|
||||
"Programming Language :: Python :: 3.6",
|
||||
"Programming Language :: Python :: Implementation :: CPython",
|
||||
"Programming Language :: Python :: Implementation :: PyPy",
|
||||
"Topic :: Communications",
|
||||
|
|
13
tox.ini
13
tox.ini
|
@ -2,14 +2,13 @@
|
|||
minversion = 1.6
|
||||
skipsdist = True
|
||||
envlist = pep8,
|
||||
py26,
|
||||
py26-gevent,
|
||||
py26-eventlet,
|
||||
py27,
|
||||
py27-gevent,
|
||||
py27-eventlet,
|
||||
py33,
|
||||
py34,
|
||||
py35,
|
||||
py36,
|
||||
pypy
|
||||
|
||||
[testenv:pep8]
|
||||
|
@ -33,14 +32,6 @@ deps = {[testenv]deps}
|
|||
deps = {[testenv]deps}
|
||||
-r{toxinidir}/requirements_eventlet.txt
|
||||
|
||||
[testenv:py26-gevent]
|
||||
deps = {[testenv]deps}
|
||||
-r{toxinidir}/requirements_gevent.txt
|
||||
|
||||
[testenv:py26-eventlet]
|
||||
deps = {[testenv]deps}
|
||||
-r{toxinidir}/requirements_eventlet.txt
|
||||
|
||||
[flake8]
|
||||
builtins = _
|
||||
exclude = .venv,.tox,dist,doc,*egg,.git,build,tools
|
||||
|
|
Loading…
Reference in New Issue