diff options
| -rw-r--r-- | requirements-py3.txt | 45 | ||||
| -rw-r--r-- | requirements.txt | 31 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | test-requirements-py3.txt | 30 | ||||
| -rw-r--r-- | test-requirements.txt | 14 | ||||
| -rw-r--r-- | tox.ini | 4 |
6 files changed, 27 insertions, 98 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt deleted file mode 100644 index 744d9dd..0000000 --- a/requirements-py3.txt +++ /dev/null @@ -1,45 +0,0 @@ -# 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. - -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -stevedore>=1.5.0 # Apache-2.0 - -# for jsonutils -six>=1.9.0 - -# FIXME(markmc): remove this when the drivers no longer -# import eventlet - -eventlet>=0.17.3 - -# for the routing notifier -PyYAML>=3.1.0 - -# rabbit driver is the default -# we set the amqp version to ensure heartbeat works -amqp>=1.4.0 -kombu>=3.0.7 - -# middleware -oslo.middleware>=1.2.0,!=2.0.0 # Apache-2.0 - -# FIXME: concurrent.futures is part of the Python stdlib since Python 3.2, -# but the requirements is still needed because of a bug in tox: -# https://bitbucket.org/hpk42/tox/issue/236/tox-must-create-the-source-distribution -# -# Tox builds a source distribution with "python setup.py sdist" which uses -# requirements.txt even if tox wants to build the py34 virtual environment. -# As a consequence, oslo.messaging.egg_info/requires.txt contains futures -# and oslo_messaging.tests.test_opts.OptsTestCase.test_entry_point fails. -# -# for the futures based executor -futures>=3.0 - -# needed by the aioeventlet executor -aioeventlet>=0.4 -trollius>=1.0 diff --git a/requirements.txt b/requirements.txt index 7a27c16..d3d5452 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 -oslo.config>=1.11.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -stevedore>=1.5.0 # Apache-2.0 +oslo.config>=1.11.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 # for jsonutils six>=1.9.0 @@ -17,7 +17,7 @@ six>=1.9.0 # FIXME(markmc): remove this when the drivers no longer # import eventlet -eventlet>=0.17.3 +eventlet>=0.17.4 # for the routing notifier PyYAML>=3.1.0 @@ -28,10 +28,19 @@ amqp>=1.4.0 kombu>=3.0.7 # middleware -oslo.middleware>=1.2.0,!=2.0.0 # Apache-2.0 - +oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0 + +# FIXME: concurrent.futures is part of the Python stdlib since Python 3.2, +# but the requirements is still needed because of a bug in tox: +# https://bitbucket.org/hpk42/tox/issue/236/tox-must-create-the-source-distribution +# +# Tox builds a source distribution with "python setup.py sdist" which uses +# requirements.txt even if tox wants to build the py34 virtual environment. +# As a consequence, oslo.messaging.egg_info/requires.txt contains futures +# and oslo_messaging.tests.test_opts.OptsTestCase.test_entry_point fails. +# # for the futures based executor -futures>=3.0 +futures>=3.0;python_version=='2.7' or python_version=='2.6' # needed by the aioeventlet executor aioeventlet>=0.4 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt deleted file mode 100644 index 71fe497..0000000 --- a/test-requirements-py3.txt +++ /dev/null @@ -1,30 +0,0 @@ -# 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.10.0,<0.11 - -discover -fixtures>=0.3.14 -mox3>=0.7.0 -python-subunit>=0.0.18 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 -oslotest>=1.5.1 # Apache-2.0 - -# for test_matchmaker_redis -redis>=2.10.0 - -# for test_impl_zmq -pyzmq>=14.3.1 # LGPL+BSD - -# when we can require tox>= 1.4, this can go into tox.ini: -# [testenv:cover] -# deps = {[testenv]deps} coverage -coverage>=3.6 - -# this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index c962f4a..66359de 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,20 +3,20 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 discover -fixtures>=0.3.14 +fixtures>=1.3.1 mock>=1.0 mox3>=0.7.0 python-subunit>=0.0.18 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 -oslotest>=1.5.1 # Apache-2.0 +testtools>=1.4.0 +oslotest>=1.5.1 # Apache-2.0 # for test_qpid -qpid-python +qpid-python;python_version=='2.7' # for test_matchmaker_redis redis>=2.10.0 @@ -30,5 +30,5 @@ pyzmq>=14.3.1 # LGPL+BSD coverage>=3.6 # this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 @@ -24,10 +24,6 @@ commands = {posargs} [testenv:docs] commands = python setup.py build_sphinx -[testenv:py34] -deps = -r{toxinidir}/requirements-py3.txt - -r{toxinidir}/test-requirements-py3.txt - [testenv:py27-func-qpid] setenv = TRANSPORT_URL=qpid://stackqpid:secretqpid@127.0.0.1:65123// commands = {toxinidir}/setup-test-env-qpid.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' |