From b1f00852e3630612cd9279a1ff84fe9b4edda830 Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Mon, 8 Jun 2020 11:24:08 -0400 Subject: [PATCH] Uplift python deps to match deckhand Pegleg is a consumer of both Promenade and Deckhand, these projects have conflicting versions of multiple Python requirements. This patch: - Uplifts Promenade to more recent versions of these dependencies to match Deckhand. - Applies `tox -e freeze` to uplift requirements-frozen.txt Locally these changes can be tested to ensure compatability with Pegleg by following these steps: 1. Checkout this patch locally 2. Clone Pegleg to local disc 3. Update Pegleg's Pipfile, specifically changing line 30: promenade = {file = "/your/path/to/local/promenade"} 4. Run tox -e update-requirements from Pegleg If these steps are successful you will see the following output: update-requirements: commands succeeded congratulations :) Change-Id: Ifdc74c4f80f599058e8b56008e234324a6d89e49 Signed-off-by: Alexander Hughes --- requirements-direct.txt | 16 +++--- requirements-frozen.txt | 120 ++++++++++++++++++++-------------------- 2 files changed, 67 insertions(+), 69 deletions(-) diff --git a/requirements-direct.txt b/requirements-direct.txt index aced9816..e513c717 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -1,17 +1,17 @@ -beaker==1.9.1 +beaker==1.10.0 click==6.7 docker==3.7.2 -falcon==1.2.0 -jinja2==2.9.6 +falcon==1.4.1 +jinja2==2.10 jsonpath-ng==1.4.3 jsonschema==2.6.0 -keystoneauth1==3.2.0 -keystonemiddleware==4.17.0 +keystoneauth1==3.11.1 +keystonemiddleware==5.3.0 kubernetes==3.0.0 -oslo.context==2.19.2 -oslo.policy==1.22.1 +oslo.context==2.21.0 +oslo.policy==1.40.1 pastedeploy==1.5.2 pyyaml~=5.1 requests==2.22.0 -uwsgi==2.0.15 +uwsgi==2.0.17.1 git+https://opendev.org/airship/deckhand.git@7d2092b100bddcab77fca0acadd9fc99ba59797b#egg=deckhand diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 944491da..2ae7d9fc 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -1,118 +1,116 @@ alembic==1.0.1 -amqp==2.5.1 -asn1crypto==0.24.0 -Babel==2.7.0 -Beaker==1.9.1 -cachetools==3.1.1 -certifi==2019.9.11 -cffi==1.12.3 +amqp==2.6.0 +asn1crypto==1.3.0 +Babel==2.8.0 +Beaker==1.10.0 +cachetools==4.1.0 +certifi==2020.4.5.2 +cffi==1.14.0 chardet==3.0.4 click==6.7 -cliff==2.16.0 +cliff==3.1.0 cmd2==0.8.9 cryptography==2.3.1 debtcollector==1.22.0 -git+https://opendev.org/airship/deckhand.git@7d2092b100bddcab77fca0acadd9fc99ba59797b#egg=deckhand -decorator==4.4.0 +Deckhand @ git+https://opendev.org/airship/deckhand.git@7d2092b100bddcab77fca0acadd9fc99ba59797b +decorator==4.4.2 deepdiff==3.3.0 dnspython==1.16.0 docker==3.7.2 docker-pycreds==0.4.0 -dogpile.cache==0.7.1 -eventlet==0.25.1 +dogpile.cache==0.9.2 +eventlet==0.25.2 extras==1.0.0 -falcon==1.2.0 +falcon==1.4.1 fasteners==0.15 fixtures==3.0.0 flake8==2.6.2 -futurist==1.9.0 -google-auth==1.6.3 -greenlet==0.4.15 +futurist==1.10.0 +google-auth==1.16.1 +greenlet==0.4.16 hacking==1.1.0 idna==2.8 -importlib-metadata==0.23 -ipaddress==1.0.22 +importlib-metadata==1.6.1 +ipaddress==1.0.23 iso8601==0.1.12 -Jinja2==2.9.6 +Jinja2==2.10 jsonpath-ng==1.4.3 -jsonpickle==1.2 +jsonpickle==1.4.1 jsonschema==2.6.0 -keystoneauth1==3.2.0 -keystonemiddleware==4.17.0 -kombu==4.6.4 +keystoneauth1==3.11.1 +keystonemiddleware==5.3.0 +kombu==4.6.10 kubernetes==3.0.0 linecache2==1.0.0 -Mako==1.1.0 +Mako==1.1.3 MarkupSafe==1.1.1 mccabe==0.5.3 monotonic==1.5 -more-itertools==7.2.0 -msgpack==0.6.2 +msgpack==1.0.0 netaddr==0.7.19 netifaces==0.10.9 networkx==2.2 -oslo.cache==1.31.1 +os-service-types==1.7.0 +oslo.cache==1.38.1 oslo.concurrency==3.28.1 -oslo.config==6.11.1 -oslo.context==2.19.2 +oslo.config==7.0.0 +oslo.context==2.21.0 oslo.db==4.41.1 -oslo.i18n==3.24.0 -oslo.log==3.44.1 +oslo.i18n==3.25.1 +oslo.log==3.45.2 oslo.messaging==9.1.1 oslo.middleware==3.36.0 -oslo.policy==1.22.1 +oslo.policy==1.40.1 oslo.serialization==2.29.2 -oslo.service==1.40.2 -oslo.utils==3.41.1 +oslo.service==1.41.1 +oslo.utils==3.42.1 Paste==3.0.1 PasteDeploy==1.5.2 -pbr==5.4.3 +pbr==5.4.5 ply==3.11 -positional==1.2.1 prettytable==0.7.2 psycopg2==2.7.5 -pyasn1==0.4.7 -pyasn1-modules==0.2.6 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 pycadf==2.10.0 pycodestyle==2.0.0 -pycparser==2.19 +pycparser==2.20 pyflakes==1.2.3 pyinotify==0.9.6 -pyparsing==2.4.2 -pyperclip==1.7.0 +pyparsing==2.4.7 +pyperclip==1.8.0 python-barbicanclient==4.7.0 -python-dateutil==2.8.0 +python-dateutil==2.8.1 python-editor==1.0.4 -python-keystoneclient==3.21.0 +python-keystoneclient==3.22.0 python-memcached==1.59 python-mimeparse==1.6.0 -pytz==2019.2 -PyYAML==5.1.2 +pytz==2020.1 +PyYAML==5.3.1 repoze.lru==0.7 requests==2.22.0 -rfc3986==1.3.2 +rfc3986==1.4.0 Routes==2.4.1 rsa==4.0 -six==1.12.0 -SQLAlchemy==1.3.8 -sqlalchemy-migrate==0.12.0 -sqlparse==0.3.0 +six==1.15.0 +SQLAlchemy==1.3.17 +sqlalchemy-migrate==0.13.0 +sqlparse==0.3.1 statsd==3.3.0 -stevedore==1.31.0 +stevedore==1.32.0 Tempita==0.5.2 testresources==2.0.1 testscenarios==0.5.0 -testtools==2.3.0 +testtools==2.4.0 traceback2==1.4.0 unittest2==1.1.0 -urllib3==1.25.5 -uWSGI==2.0.15 +urllib3==1.25.9 +uWSGI==2.0.17.1 vine==1.3.0 -wcwidth==0.1.7 -WebOb==1.8.5 -websocket-client==0.56.0 -wheel==0.34.2 +wcwidth==0.2.4 +WebOb==1.8.6 +websocket-client==0.57.0 Werkzeug==0.14.1 -wrapt==1.11.2 -yappi==1.0 -zipp==0.6.0 +wrapt==1.12.1 +yappi==1.2.5 +zipp==1.2.0