summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2014-09-08 18:01:40 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2014-09-25 13:05:09 -0700
commit4fa33509458e75675bd639d3c9fa9a0d46595e66 (patch)
treeb7aa304aec28bd7fa15cd4d4239e992d1cedeaa0 /tox.ini
parent3fdafcd17f85e532342d5ddb45b972b5c462f843 (diff)
downloadoslo-db-4fa33509458e75675bd639d3c9fa9a0d46595e66.tar.gz
Start adding a environment for py34/py33
Get a tox environment for py34/py33 that doesn't stop the existing py26 and py27 to continue working with the adjusted test-requirements since MySQL-python and sqlalchemy-migrate do not yet exist in 3.x. Note that this does not fully make py34 work yet but it starts to work in this direction of getting it to work (which will apparently require quite a big more tweaking). Change-Id: I024957a76f2de0bd406d14da5af6e4caf3d493e7
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini12
1 files changed, 10 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 36653f7..635486c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 1.6
-envlist = py26,py27,pep8
+envlist = py26,py27,py33,py34,pep8
# NOTE(dhellmann): We cannot set skipdist=True
# for oslo libraries because of the namespace package.
#skipsdist = True
@@ -13,7 +13,7 @@ install_command = pip install -U {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/test-requirements-py2.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:sqla_09]
@@ -24,6 +24,14 @@ commands = pip install SQLAlchemy>=0.9.0,!=0.9.5,<1.0.0
commands = pip install SQLAlchemy>=0.8.0,<0.9.0
python setup.py testr --slowest --testr-args='{posargs}'
+[testenv:py34]
+deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements-py3.txt
+
+[testenv:py33]
+deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements-py3.txt
+
[testenv:pep8]
commands = flake8