From ac63f126c6bd0ab12d6cd80077023c3e5c264e98 Mon Sep 17 00:00:00 2001 From: Boden R Date: Mon, 23 Jul 2018 07:21:30 -0600 Subject: [PATCH] update requirements for neutron-lib 1.18.0 Neutron-lib 1.18.0 is our Rocky RC and is already being used by neutron [1]. This patch updates the neutron-lib required version to match neutron [1] in prep for the Rocky release. [1] https://review.openstack.org/#/c/583671/ To work with neutron-lib 1.18.0, we need Rocky version of neutron, so the minimum version of neutron is bumped to 13.0.0.0b2 (Rocky-2). We also need to bump the minimum version of SQLAlchemy. Rocky neutron depends on pending_to_persistent ORM event in SQLAlchemy which was added in SQLAlchemy 1.1. Rocky neutron now requires SqlAlchemy>=1.2.0, so the min version of SQLAlchemy is bumped to 1.2.0. Co-Authored-By: Akihiro Motoki Change-Id: Ifa33d7bc000ebbcf5e0f130fe0e0e34207f3361c --- lower-constraints.txt | 6 +++--- requirements.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 3c54e3a7..be73f054 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -52,8 +52,8 @@ msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -neutron==12.0.0 -neutron-lib==1.13.0 +neutron==13.0.0.0b2 +neutron-lib==1.18.0 openstackdocstheme==1.18.1 openstacksdk==0.11.2 os-client-config==1.28.0 @@ -124,7 +124,7 @@ six==1.10.0 snowballstemmer==1.2.1 Sphinx==1.6.5 sphinxcontrib-websupport==1.0.1 -SQLAlchemy==1.0.10 +SQLAlchemy==1.2.0 sqlalchemy-migrate==0.11.0 sqlparse==0.2.2 statsd==3.2.1 diff --git a/requirements.txt b/requirements.txt index c7563664..1ef7c173 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,10 +6,10 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT httplib2>=0.9.1 # MIT netaddr>=0.7.18 # BSD -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +SQLAlchemy>=1.2.0 # MIT alembic>=0.8.10 # MIT six>=1.10.0 # MIT -neutron-lib>=1.13.0 # Apache-2.0 +neutron-lib>=1.18.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.db>=4.27.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 @@ -17,4 +17,4 @@ oslo.messaging>=5.29.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 -neutron>=12.0.0 # Apache-2.0 +neutron>=13.0.0.0b2 # Apache-2.0