diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-09-08 18:01:40 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-09-25 13:05:09 -0700 |
| commit | 4fa33509458e75675bd639d3c9fa9a0d46595e66 (patch) | |
| tree | b7aa304aec28bd7fa15cd4d4239e992d1cedeaa0 | |
| parent | 3fdafcd17f85e532342d5ddb45b972b5c462f843 (diff) | |
| download | oslo-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
| -rw-r--r-- | test-requirements-py2.txt (renamed from test-requirements.txt) | 0 | ||||
| -rw-r--r-- | test-requirements-py3.txt | 21 | ||||
| -rw-r--r-- | tox.ini | 12 |
3 files changed, 31 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements-py2.txt index f5c1c9d..f5c1c9d 100644 --- a/test-requirements.txt +++ b/test-requirements-py2.txt diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt new file mode 100644 index 0000000..a368ba1 --- /dev/null +++ b/test-requirements-py3.txt @@ -0,0 +1,21 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +hacking>=0.9.2,<0.10 + +coverage>=3.6 +discover +doc8 # Apache-2.0 +fixtures>=0.3.14 +psycopg2 +python-subunit>=0.0.18 +sphinx>=1.1.2,!=1.2.0,<1.3 +oslosphinx>=2.2.0 # Apache-2.0 +oslotest>=1.1.0 # Apache-2.0 +testrepository>=0.0.18 +testscenarios>=0.4 +testtools>=0.9.34 + +# TODO(harlowja): add in pymysql when able to... +# https://review.openstack.org/#/c/123737 @@ -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 |