openstack/deb-kazoo
Code Issues Proposed changes

Reduce tox envs and do basic eventlet + gevent only

Browse Source
This commit is contained in:
Joshua Harlow
2015-05-29 11:37:00 -07:00
parent 3cc19cc2a7
commit 37b9d20abf
3 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@@ -10,27 +10,27 @@ matrix:
- python: "2.6"
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26
- python: "2.6"
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent-0.13.8
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent
- python: "2.6"
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent-0.13.8
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent
- python: "2.6"
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-gevent-1.0.1
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py26-eventlet
- python: "2.6"
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-gevent-1.0.1
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py26-eventlet
- python: "2.7"
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27
- python: "2.7"
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27
- python: "2.7"
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent-0.13.8
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent
- python: "2.7"
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent-0.13.8
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent
- python: "2.7"
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-gevent-1.0.1
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py27-eventlet
- python: "2.7"
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-gevent-1.0.1
env: ZOOKEEPER_VERSION=3.4.6 TOX_VENV=py27-eventlet
- python: "2.7"
env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27-gevent-1.0.1
env: ZOOKEEPER_VERSION=3.5.0-alpha TOX_VENV=py27-gevent
- python: "3.3"
env: ZOOKEEPER_VERSION=3.3.6 TOX_VENV=py33
- python: "3.3"

2
requirements_gevent.txt
View File

@@ -1 +1 @@
greenlet==0.4.3
gevent

38
tox.ini
View File

@@ -3,11 +3,11 @@ minversion = 1.6
skipsdist = True
envlist = pep8,
py26,
py26-gevent-0.13.8,
py26-gevent-1.0.1,
py26-gevent,
py26-eventlet,
py27,
py27-gevent-0.13.8,
py27-gevent-1.0.1,
py27-gevent,
py27-eventlet,
py33,
py34,
pypy
@@ -23,39 +23,21 @@ deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/requirements_sphinx.txt
commands = {toxinidir}/ensure-zookeeper-env.sh nosetests {posargs: -d -v --with-coverage kazoo.tests}
[testenv:py27]
[testenv:py27-gevent]
deps = {[testenv]deps}
-r{toxinidir}/requirements_gevent.txt
[testenv:py27-eventlet]
deps = {[testenv]deps}
-r{toxinidir}/requirements_eventlet.txt
gevent
[testenv:py27-gevent-0.13.8]
[testenv:py26-gevent]
deps = {[testenv]deps}
-r{toxinidir}/requirements_gevent.txt
gevent==0.13.8
[testenv:py27-gevent-1.0.1]
[testenv:py26-eventlet]
deps = {[testenv]deps}
-r{toxinidir}/requirements_gevent.txt
gevent==1.0.1
[testenv:py26]
deps = {[testenv]deps}
-r{toxinidir}/requirements_gevent.txt
-r{toxinidir}/requirements_eventlet.txt
gevent
[testenv:py26-gevent-0.13.8]
deps = {[testenv]deps}
-r{toxinidir}/requirements_gevent.txt
-r{toxinidir}/requirements_eventlet.txt
gevent==0.13.8
[testenv:py26-gevent-1.0.1]
deps = {[testenv]deps}
-r{toxinidir}/requirements_gevent.txt
-r{toxinidir}/requirements_eventlet.txt
gevent==1.0.1
[flake8]
builtins = _