From b1ca8d08aa2c46a4c40cba8d12bba1655fa862de Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Mon, 26 Feb 2024 21:23:10 +0000 Subject: [PATCH] Airflow stable 2.8.2 This PS bumps up Airflow version to the latest 2.8.2 and also bumps up openstack dependences to Antelope 2023.1 Change-Id: I1ab801527dacb7c667caf1d459d71f9df522cef6 --- .zuul.yaml | 2 +- requirements-direct.txt | 38 ++++++++++++++++--- requirements-frozen.txt | 82 ++++++++++++++++++++--------------------- tox.ini | 2 +- vcs-requirements.env | 6 +-- 5 files changed, 79 insertions(+), 51 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 8f8045d8..515296b0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -160,7 +160,7 @@ commit: true static: - latest - - airflow_2.8.1 + - airflow_2.8.2 - secret: name: airship_pegleg_quay_creds diff --git a/requirements-direct.txt b/requirements-direct.txt index 781b0cc5..d6b40e3c 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -4,12 +4,40 @@ GitPython docker pylibyaml PyYAML -deckhand @ git+https://opendev.org/airship/deckhand.git@5d2765e513fa55be74aef4456d6b353d24bc7097#egg=deckhand -shipyard-client @ git+https://opendev.org/airship/shipyard.git@20593bc746dc0bf417d7057420b40e7c5bb30998#egg=shipyard-client&subdirectory=src/bin/shipyard_client -promenade @ git+https://opendev.org/airship/promenade.git@1a0ea41f286980bf1ccdb185578d9795983512eb#egg=promenade -oslo.i18n==6.0.0 -oslo.utils==4.12.3 six debtcollector zipp psycopg2-binary + +# Airship dependencies +deckhand @ git+https://opendev.org/airship/deckhand.git@32e9950db405b5d1eb74da0c4e8df344a8638eff#egg=deckhand +shipyard-client @ git+https://opendev.org/airship/shipyard.git@6c356a902d8d5e07cf87d8fe94e4030a066e7def#egg=shipyard-client&subdirectory=src/bin/shipyard_client +promenade @ git+https://opendev.org/airship/promenade.git@d21e3434f641e1f1e7400a44e77fccb5b87a2824#egg=promenade + + +# Openstack Antelope 2023.1 +# https://releases.openstack.org/antelope/index.html +barbican==16.0.0 + +python-barbicanclient==5.5.0 +python-keystoneclient==5.1.0 + +keystoneauth1==5.1.2 +keystonemiddleware==10.2.0 + +oslo.cache==3.3.1 +oslo.concurrency==5.1.1 +oslo.config==9.1.1 +oslo.context==5.1.1 +oslo.db==12.3.1 +oslo.i18n==6.0.0 +oslo.log==5.2.0 +oslo.messaging==14.2.4 +oslo.metrics==0.6.0 +oslo.middleware==5.1.1 +oslo.policy==4.1.1 +oslo.serialization==5.1.1 +oslo.service==3.1.1 +oslo.upgradecheck==2.1.1 +oslo.utils==6.1.0 +oslo.versionedobjects==3.1.0 \ No newline at end of file diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 52ba041f..a0da084d 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -4,12 +4,12 @@ arrow==1.3.0 attrs==23.2.0 autopage==0.5.2 backports.zoneinfo==0.2.1 -barbican==14.0.2 +barbican==16.0.0 bcrypt==4.1.2 Beaker==1.12.1 cachetools==5.3.2 -castellan==4.3.0 -certifi==2023.11.17 +castellan==4.4.0 +certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 click==8.1.7 @@ -18,21 +18,21 @@ cliff==4.6.0 cmd2==2.4.3 cryptography==41.0.7 debtcollector==3.0.0 -Deckhand @ git+https://opendev.org/airship/deckhand.git@5d2765e513fa55be74aef4456d6b353d24bc7097 +Deckhand @ git+https://opendev.org/airship/deckhand.git@32e9950db405b5d1eb74da0c4e8df344a8638eff decorator==5.1.1 deepdiff==6.7.1 -dnspython==2.4.2 +dnspython==2.6.1 docker==7.0.0 dogpile.cache==1.3.2 -eventlet==0.34.3 +eventlet==0.35.2 falcon==3.1.3 fasteners==0.19 fixtures==4.1.0 Flask==2.2.5 futurist==3.0.0 gitdb==4.0.11 -GitPython==3.1.41 -google-auth==2.26.2 +GitPython==3.1.42 +google-auth==2.28.1 greenlet==3.0.3 html5lib==0.9999999 httpexceptor==1.4.0 @@ -43,17 +43,18 @@ iso8601==2.1.0 itsdangerous==2.1.2 Jinja2==3.1.3 jsonpath-ng==1.6.1 -jsonpickle==3.0.2 -jsonschema==4.20.0 +jsonpickle==3.0.3 +jsonschema==4.21.1 jsonschema-specifications==2023.12.1 -keystoneauth1==4.3.1 -keystonemiddleware==10.6.0 +keystoneauth1==5.1.2 +keystonemiddleware==10.2.0 kombu==5.3.5 -kubernetes==23.6.0 +kubernetes==29.0.0 ldap3==2.9.1 logutils==0.3.5 -Mako==1.3.0 -MarkupSafe==2.1.3 +Mako==1.3.2 +MarkupSafe==2.1.5 +microversion-parse==1.0.1 msgpack==1.0.7 netaddr==1.2.1 netifaces==0.11.0 @@ -61,22 +62,22 @@ networkx==3.1 oauthlib==3.2.2 ordered-set==4.1.0 os-service-types==1.7.0 -oslo.cache==3.6.0 -oslo.concurrency==5.3.0 -oslo.config==8.6.0 -oslo.context==4.0.0 -oslo.db==11.2.0 +oslo.cache==3.3.1 +oslo.concurrency==5.1.1 +oslo.config==9.1.1 +oslo.context==5.1.1 +oslo.db==12.3.1 oslo.i18n==6.0.0 -oslo.log==4.8.0 -oslo.messaging==14.6.0 -oslo.metrics==0.8.0 -oslo.middleware==6.1.0 -oslo.policy==3.10.1 -oslo.serialization==4.1.0 -oslo.service==3.4.0 -oslo.upgradecheck==2.3.0 -oslo.utils==4.12.3 -oslo.versionedobjects==3.3.0 +oslo.log==5.2.0 +oslo.messaging==14.2.4 +oslo.metrics==0.6.0 +oslo.middleware==5.1.1 +oslo.policy==4.1.1 +oslo.serialization==5.1.1 +oslo.service==3.1.1 +oslo.upgradecheck==2.1.1 +oslo.utils==6.1.0 +oslo.versionedobjects==3.1.0 packaging==23.2 Paste==3.7.1 PasteDeploy==3.1.0 @@ -87,38 +88,37 @@ pip==23.2.1 pkgutil_resolve_name==1.3.10 ply==3.11 prettytable==3.10.0 -promenade @ git+https://opendev.org/airship/promenade.git@1a0ea41f286980bf1ccdb185578d9795983512eb -prometheus-client==0.19.0 +promenade @ git+https://opendev.org/airship/promenade.git@d21e3434f641e1f1e7400a44e77fccb5b87a2824 +prometheus_client==0.20.0 psycopg2-binary==2.9.9 PTable==0.9.2 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycadf==3.1.1 pycparser==2.21 -PyJWT==2.8.0 pylibyaml==0.1.0 -pyOpenSSL==23.3.0 +pyOpenSSL==24.0.0 pyparsing==3.1.1 pyperclip==1.8.2 -python-barbicanclient==5.4.0 +python-barbicanclient==5.5.0 python-dateutil==2.8.2 -python-keystoneclient==5.3.0 +python-keystoneclient==5.1.0 python-memcached==1.62 python-mimeparse==1.6.0 -pytz==2023.3.post1 +pytz==2024.1 PyYAML==6.0.1 -referencing==0.32.1 +referencing==0.33.0 repoze.lru==0.7 requests==2.31.0 requests-oauthlib==1.3.1 resolver==0.2.1 rfc3986==1.5.0 Routes==2.5.1 -rpds-py==0.17.1 +rpds-py==0.18.0 rsa==4.9 selector==0.10.1 setuptools==68.2.2 -shipyard-client @ git+https://opendev.org/airship/shipyard.git@20593bc746dc0bf417d7057420b40e7c5bb30998#subdirectory=src/bin/shipyard_client +shipyard-client @ git+https://opendev.org/airship/shipyard.git@6c356a902d8d5e07cf87d8fe94e4030a066e7def#subdirectory=src/bin/shipyard_client simplejson==3.19.2 six==1.16.0 smmap==5.0.1 @@ -134,7 +134,7 @@ testtools==2.7.1 tiddlyweb==2.4.3 types-python-dateutil==2.8.19.20240106 typing_extensions==4.9.0 -tzdata==2023.4 +tzdata==2024.1 urllib3==1.26.18 uWSGI==2.0.24 vine==5.1.0 diff --git a/tox.ini b/tox.ini index 5ef1eabb..009ebb85 100644 --- a/tox.ini +++ b/tox.ini @@ -100,7 +100,7 @@ allowlist_externals= sh deps= -r{toxinidir}/requirements-direct.txt - -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.8.txt + -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.2/constraints-3.8.txt commands= rm -f {toxinidir}/requirements-frozen.txt sh -c "pip freeze --all | grep -vE 'pegleg|pyinotify|pkg-resources' > requirements-frozen.txt" diff --git a/vcs-requirements.env b/vcs-requirements.env index 6579bc34..d3250b22 100644 --- a/vcs-requirements.env +++ b/vcs-requirements.env @@ -1,3 +1,3 @@ -DECKHAND_VERSION=commit/37ba567da5bf7f146f54a468478a025c70793574 -SHIPYARD_VERSION=commit/1ba0e726280307551ebfe499c74e79717400dcb8 -PROMENADE_VERSION=commit/12fdf402f64a2a910c8d736e96b6a6c0f7dabdc3 +DECKHAND_VERSION=commit/32e9950db405b5d1eb74da0c4e8df344a8638eff +SHIPYARD_VERSION=commit/6c356a902d8d5e07cf87d8fe94e4030a066e7def +PROMENADE_VERSION=commit/d21e3434f641e1f1e7400a44e77fccb5b87a2824