summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-03 10:41:51 +0000
committerGerrit Code Review <review@openstack.org>2017-05-03 10:41:51 +0000
commita29ebc444db87aaf82751ea8c5806b15523e3644 (patch)
tree0365905cda4f02c9db242593fa5be85c90dfed02
parent09057b6bb305843e3dfb1c48467a27f642ea4547 (diff)
parent79349cf2f2001830e529c9fc2f998b3080c42285 (diff)
downloadtaskflow-a29ebc444db87aaf82751ea8c5806b15523e3644.tar.gz
Merge "Updated from global requirements"
-rw-r--r--requirements.txt2
-rw-r--r--setup.cfg4
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index a060f50..9d61ac5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
# See: https://bugs.launchpad.net/pbr/+bug/1384919 for why this is here...
-pbr>=2.0.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
# Packages needed for using this library.
diff --git a/setup.cfg b/setup.cfg
index ebd3520..30b02bc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -63,14 +63,14 @@ zookeeper =
redis =
redis>=2.10.0 # MIT
workers =
- kombu>=3.0.25 # BSD
+ kombu!=4.0.2,>=4.0.0 # BSD
eventlet =
eventlet!=0.18.3,>=0.18.2 # MIT
doc =
sphinx>=1.5.1 # BSD
oslosphinx>=4.7.0 # Apache-2.0
database =
- SQLAlchemy<1.1.0,>=1.0.10 # MIT
+ SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
alembic>=0.8.10 # MIT
SQLAlchemy-Utils # BSD License
PyMySQL>=0.7.6 # MIT License