From 1dce3fe7388999e8471b262b2df891becdedd54e Mon Sep 17 00:00:00 2001 From: Nataliia Uvarova Date: Wed, 21 May 2014 16:35:46 +0200 Subject: [PATCH] Add separate requirements file for Python 3 Separate requirements-py3.txt file allows to specify different dependency list for python 3. For example, now python-memcached doesn't support py3k and some other dependencies may appear later. Also tox.ini was changed to use proper requirements file for py33 testenv. Partially-implements: blueprint py3k-support Change-Id: I55aa0e3364124f27532465fcaa0b9316c7dc67e6 --- requirements-py3.txt | 18 ++++++++++++++++++ test-requirements-py3.txt | 23 +++++++++++++++++++++++ tox.ini | 4 ++++ 3 files changed, 45 insertions(+) create mode 100644 requirements-py3.txt create mode 100644 test-requirements-py3.txt diff --git a/requirements-py3.txt b/requirements-py3.txt new file mode 100644 index 000000000..ee73732ff --- /dev/null +++ b/requirements-py3.txt @@ -0,0 +1,18 @@ +pbr>=0.6,!=0.7,<1.0 + +Babel>=1.3 +netaddr>=0.7.6 +falcon>=0.1.6,<0.2.0 +jsonschema>=2.0.0,<3.0.0 +iso8601>=0.1.9 +msgpack-python +posix_ipc +pymongo>=2.4 +python-keystoneclient>=0.7.0 +# python-memcached has no Py3k support for now +# python-memcached>=1.48 +WebOb>=1.2.3 +stevedore>=0.14 +six>=1.6.0 +oslo.config>=1.2.0 +SQLAlchemy>=0.7.8,<=0.9.99 diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt new file mode 100644 index 000000000..6f8baafef --- /dev/null +++ b/test-requirements-py3.txt @@ -0,0 +1,23 @@ +# Metrics and style +hacking>=0.8.0,<0.9 + +# Packaging +mock>=1.0 + +# Unit testing +ddt>=0.4.0 +discover +fixtures>=0.3.14 +httpretty>=0.8.0 +python-subunit>=0.0.18 +testrepository>=0.0.18 +testtools>=0.9.34 + +# Functional Tests +requests>=1.1 + +# Documentation +sphinx>=1.1.2,<1.2 +oslosphinx +openstack-doc-tools>=0.11 + diff --git a/tox.ini b/tox.ini index 9109c6f1d..808556ee6 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,10 @@ deps = -r{toxinidir}/requirements.txt #commands = nosetests {posargs} commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}' +[testenv:py33] +deps = -r{toxinidir}/requirements-py3.txt + -r{toxinidir}/test-requirements-py3.txt + [tox:jenkins] downloadcache = ~/cache/pip