diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2015-05-29 11:37:00 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2015-05-29 11:37:00 -0700 |
| commit | 37b9d20abf53632c727adb9b9dc4c6e36ae528fd (patch) | |
| tree | a6c43dd8f69b6dfe2062776754df0933e8b29e03 | |
| parent | 3cc19cc2a7a9d303088181534fe2dc9931f64134 (diff) | |
| download | kazoo-37b9d20abf53632c727adb9b9dc4c6e36ae528fd.tar.gz | |
Reduce tox envs and do basic eventlet + gevent only
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | requirements_gevent.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 34 |
3 files changed, 18 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index 729f446..e72ef06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/requirements_gevent.txt b/requirements_gevent.txt index 2a4e627..4a63abe 100644 --- a/requirements_gevent.txt +++ b/requirements_gevent.txt @@ -1 +1 @@ -greenlet==0.4.3 +gevent @@ -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 - -r{toxinidir}/requirements_eventlet.txt - gevent - -[testenv:py27-gevent-0.13.8] -deps = {[testenv]deps} - -r{toxinidir}/requirements_gevent.txt - gevent==0.13.8 - -[testenv:py27-gevent-1.0.1] -deps = {[testenv]deps} - -r{toxinidir}/requirements_gevent.txt - gevent==1.0.1 -[testenv:py26] +[testenv:py27-eventlet] deps = {[testenv]deps} - -r{toxinidir}/requirements_gevent.txt -r{toxinidir}/requirements_eventlet.txt - gevent -[testenv:py26-gevent-0.13.8] +[testenv:py26-gevent] deps = {[testenv]deps} -r{toxinidir}/requirements_gevent.txt - -r{toxinidir}/requirements_eventlet.txt - gevent==0.13.8 -[testenv:py26-gevent-1.0.1] +[testenv:py26-eventlet] deps = {[testenv]deps} - -r{toxinidir}/requirements_gevent.txt -r{toxinidir}/requirements_eventlet.txt - gevent==1.0.1 [flake8] builtins = _ |