diff --git a/py3-testlist b/py3-testlist new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/py3-testlist @@ -0,0 +1 @@ + diff --git a/requirements-py3.txt b/requirements-py3.txt new file mode 100644 index 0000000000..1cd73a16b3 --- /dev/null +++ b/requirements-py3.txt @@ -0,0 +1,47 @@ +# 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. + +pbr>=0.6,!=0.7,<1.0 +Babel>=1.3 +eventlet>=0.17.3 +greenlet>=0.3.2 +httplib2>=0.7.5 +iso8601>=0.1.9 +keystonemiddleware>=1.5.0 +kombu>=3.0.7 +lxml>=2.3 +netaddr>=0.7.12 +oslo.config>=1.11.0 # Apache-2.0 +oslo.concurrency>=1.8.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.db>=1.7.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.0.0 # Apache-2.0 +oslo.messaging>=1.8.0 # Apache-2.0 +oslo.middleware>=1.2.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.4.0 # Apache-2.0 +osprofiler>=0.3.0 # Apache-2.0 +oslo.versionedobjects>=0.1.1 +PasteDeploy>=1.5.0 +posix_ipc +pycrypto>=2.6 +python-ceilometerclient>=1.0.13 +python-cinderclient>=1.2.0 +python-glanceclient>=0.15.0 +python-heatclient>=0.3.0 +python-keystoneclient>=1.3.0 +python-neutronclient>=2.3.11,<3 +python-novaclient>=2.22.0 +python-saharaclient>=0.9.0 +python-swiftclient>=2.2.0 +python-troveclient>=1.0.7 +PyYAML>=3.1.0 +requests>=2.5.2 +Routes>=1.12.3,!=2.0 +six>=1.9.0 +SQLAlchemy>=0.9.7,<=0.9.99 +sqlalchemy-migrate>=0.9.5 +stevedore>=1.3.0 # Apache-2.0 +WebOb>=1.2.3 diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt new file mode 100644 index 0000000000..fac1aacad5 --- /dev/null +++ b/test-requirements-py3.txt @@ -0,0 +1,18 @@ +# 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 already pins down pep8, pyflakes and flake8 +hacking<0.11,>=0.10.0 +coverage>=3.6 +discover +mock>=1.0 +mox>=0.5.3 +oslosphinx>=2.5.0 # Apache-2.0 +oslotest>=1.5.1 # Apache-2.0 +paramiko>=1.13.0 +psycopg2 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +testrepository>=0.0.18 +testscenarios>=0.4 +testtools>=0.9.36,!=1.2.0 diff --git a/tox.ini b/tox.ini index f2f5abc51b..02a902bc7d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,pep8 +envlist = py27,pep8,py34 minversion = 1.6 skipsdist = True @@ -57,6 +57,17 @@ commands = oslo-config-generator --config-file=config-generator.conf oslo-config-generator --config-file=heat_integrationtests/config-generator.conf +# FIXME(sirushtim): Sneak in flake8 here for now. This env will also be used +# to run the tests in the near future. +[testenv:py34] +deps = -r{toxinidir}/requirements-py3.txt + -r{toxinidir}/test-requirements-py3.txt +commands = + flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage contrib heat_integrationtests + find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.pyc' -delete + python setup.py testr --slowest --testr-args='--load-list py3-testlist' + + [flake8] # H404 multi line docstring should start with a summary # H405 multi line docstring summary not separated with an empty line