From d18643ada7a9337a60fae11baa0359a3714dcc3a Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 17 Mar 2020 20:59:24 +0000 Subject: [PATCH] Bring sanity to lower-constraints This is all necessary to bump the lower-constraint on msgpack so we can support msgpack 1.0 without version-specific logic in our code. The reasons for the changes are as follows: * greenlet and PyYAML bumped because the previous lower-constraints for those didn't install on python 3.7, which is a supported Python version. * msgpack-python is removed. It was replaced by msgpack and there is no new enough release of it to satisfy the needed minimum version bump. * oslo.serialization is bumped because the old version was pulling in msgpack-python, which overwrote our new needed version of msgpack. * I went ahead and included the msgpack bump to 0.6.0 so we can move forward in the subsequent patch with supporting msgpack 1.0.0. It could be argued that this should be included in the msgpack 1.0.0 change, but it ended up being complex enough that I thought it was worth it to split it out. Change-Id: I69dae65d3e0a40bb2304d74de078ab84fc778d58 --- lower-constraints.txt | 9 ++++----- requirements.txt | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index eed0624..47e42d4 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -12,7 +12,7 @@ fixtures==3.0.0 flake8==2.5.5 gitdb==0.6.4 GitPython==1.0.1 -greenlet==0.4.10 +greenlet==0.4.14 hacking==0.12.0 imagesize==0.7.1 iso8601==0.1.11 @@ -23,8 +23,7 @@ MarkupSafe==1.0 mccabe==0.2.1 mock==2.0.0 mox3==0.20.0 -msgpack-python==0.4.0 -msgpack==0.5.0 +msgpack==0.6.0 netaddr==0.7.18 netifaces==0.10.4 openstackdocstheme==1.20.0 @@ -33,7 +32,7 @@ oslo.config==5.2.0 oslo.context==2.19.2 oslo.i18n==3.15.3 oslo.log==3.36.0 -oslo.serialization==2.18.0 +oslo.serialization==2.24.0 oslo.utils==3.33.0 oslotest==3.2.0 pbr==2.0.0 @@ -47,7 +46,7 @@ python-dateutil==2.5.3 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 -PyYAML==3.12 +PyYAML==3.13 reno==2.5.0 requests==2.14.2 requestsexceptions==1.2.0 diff --git a/requirements.txt b/requirements.txt index af0829a..7228b1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ oslo.config>=5.2.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 cffi>=1.7.0 # MIT eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT -greenlet>=0.4.10 # MIT -msgpack>=0.5.0 # Apache-2.0 +greenlet>=0.4.14 # MIT +msgpack>=0.6.0 # Apache-2.0