diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6e451217ca..6715659b96 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -115,6 +115,7 @@ Fixed Contributed by Tatsuma Matsuki (@mtatsuma) * Fix dependency conflicts by updating ``requests`` (2.23.0) and ``gitpython`` (2.1.15). #4869 +* Fix dependency conflicts by specifying ``openstacksdk`` < 0.44.0. #4896 3.1.0 - June 27, 2019 --------------------- diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 62770d76e2..cfc2c2257a 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -59,3 +59,8 @@ python-statsd==2.1.0 prometheus_client==0.1.1 ujson==1.35 zipp>=0.5,<=1.0.0 +# python-mistralclient +# --> osc-lib >= 1.8.0 --> 2.0.0 +# --> openstacksdk >= 0.15.0 --> 0.44.0 +# --> futurist >= 2.1.0, which is Python 3 only +openstacksdk<0.44.0 # 0.43.0 --> futures 3.0.0, which also supports Python 2.7 diff --git a/requirements.txt b/requirements.txt index 40e8a6ea0f..463f5767d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,6 +33,7 @@ networkx==1.11 nose nose-parallel==0.3.1 nose-timer==0.7.5 +openstacksdk<0.44.0 oslo.config<1.13,>=1.12.1 oslo.utils<=3.37.0,>=3.36.2 paramiko==2.6.0 diff --git a/st2actions/in-requirements.txt b/st2actions/in-requirements.txt index 2d47af1e0b..7cbf185111 100644 --- a/st2actions/in-requirements.txt +++ b/st2actions/in-requirements.txt @@ -5,6 +5,8 @@ eventlet jinja2 kombu git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient +# Need to specify this explicitly to pin it to 0.43.0 +openstacksdk oslo.config oslo.utils requests diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index 958215c561..548beac4be 100755 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -13,6 +13,7 @@ gitpython==2.1.15 jinja2==2.10.3 kombu==4.6.6 lockfile==0.12.2 +openstacksdk<0.44.0 oslo.config<1.13,>=1.12.1 oslo.utils<=3.37.0,>=3.36.2 pyinotify==0.9.6 ; platform_system == "Linux" diff --git a/st2api/in-requirements.txt b/st2api/in-requirements.txt index 76ea3129ee..e0b40105c4 100644 --- a/st2api/in-requirements.txt +++ b/st2api/in-requirements.txt @@ -9,4 +9,6 @@ oslo.utils pymongo six git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient +# Need to specify this explicitly to pin it to 0.43.0 +openstacksdk gunicorn diff --git a/st2api/requirements.txt b/st2api/requirements.txt index 854a05e273..02f9146d5a 100644 --- a/st2api/requirements.txt +++ b/st2api/requirements.txt @@ -11,6 +11,7 @@ gunicorn==19.9.0 jsonschema==2.6.0 kombu==4.6.6 mongoengine==0.18.2 +openstacksdk<0.44.0 oslo.config<1.13,>=1.12.1 oslo.utils<=3.37.0,>=3.36.2 pymongo==3.10.0