diff options
| author | Sergey Vilgelm <sergey@vilgelm.info> | 2015-07-02 16:51:42 +0300 |
|---|---|---|
| committer | Sergey Vilgelm <sergey@vilgelm.info> | 2015-07-02 16:51:42 +0300 |
| commit | 862aca7f32cec01bc3ae5596611907c741a6055a (patch) | |
| tree | 07471f5b7fb2d9dde154ca212dbe50258ebb344d /requirements.txt | |
| parent | c9021c2116b2eb68089d67ee615c3948716b8d76 (diff) | |
| download | oslo-messaging-862aca7f32cec01bc3ae5596611907c741a6055a.tar.gz | |
Manual update the requirements
According to the disscussion[1] we have to remove the requirements-PYN.txt
[1] http://lists.openstack.org/pipermail/openstack-dev/2015-July/068469.html
Change-Id: I9de07e595f6f75b91ef3f92fddcd95300b15e772
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 31 |
1 files changed, 20 insertions, 11 deletions
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 |