From 1a0ea41f286980bf1ccdb185578d9795983512eb Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Wed, 21 Feb 2024 18:59:22 +0000 Subject: [PATCH] Airflow stable 2.8.1 Change-Id: I49093c3c5bbdf076ef9f2ffa39769f9a2ec55c5c --- images/promenade/Dockerfile.ubuntu_focal | 3 +- promenade/kubeclient.py | 7 +- requirements-direct.txt | 2 +- requirements-frozen.txt | 158 ++++++++++++----------- tox.ini | 2 +- zuul.d/jobs.yaml | 2 +- 6 files changed, 90 insertions(+), 84 deletions(-) diff --git a/images/promenade/Dockerfile.ubuntu_focal b/images/promenade/Dockerfile.ubuntu_focal index d1121536..899aa258 100644 --- a/images/promenade/Dockerfile.ubuntu_focal +++ b/images/promenade/Dockerfile.ubuntu_focal @@ -40,7 +40,8 @@ ENV TZ=Etc/UTC ENTRYPOINT ["/opt/promenade/entrypoint.sh"] RUN set -ex \ - && apt-get update -qq \ + && apt update -qq \ + && apt upgrade -y \ && apt-get install --no-install-recommends -y \ automake \ ca-certificates \ diff --git a/promenade/kubeclient.py b/promenade/kubeclient.py index 75cf5c9c..18ef93b0 100644 --- a/promenade/kubeclient.py +++ b/promenade/kubeclient.py @@ -115,9 +115,10 @@ def _get_update_labels(existing_labels, input_labels): # no existing labels found if not existing_labels: # filter delete label request since there is no labels set on a node - update_labels.update( - {k: v - for k, v in input_labels.items() if v is not None}) + update_labels.update({ + k: v + for k, v in input_labels.items() if v is not None + }) return update_labels # new labels or overriding labels diff --git a/requirements-direct.txt b/requirements-direct.txt index c71be9f1..7a7dfb54 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -1,4 +1,4 @@ -Deckhand @ git+https://opendev.org/airship/deckhand.git@37ba567da5bf7f146f54a468478a025c70793574#egg=deckhand +Deckhand @ git+https://opendev.org/airship/deckhand.git@5d2765e513fa55be74aef4456d6b353d24bc7097#egg=deckhand Beaker click falcon diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 7192fe13..0a67f05b 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -1,114 +1,117 @@ -alembic==1.11.1 -amqp==5.1.1 -attrs==23.1.0 -autopage==0.5.1 +alembic==1.13.1 +amqp==5.2.0 +attrs==23.2.0 +autopage==0.5.2 backports.zoneinfo==0.2.1 barbican==14.0.2 -bcrypt==4.0.1 +bcrypt==4.1.2 Beaker==1.12.1 -cachetools==5.3.1 -castellan==4.1.0 -certifi==2023.5.7 -cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -cliff==4.3.0 +cachetools==5.3.2 +castellan==4.3.0 +certifi==2023.11.17 +cffi==1.16.0 +charset-normalizer==3.3.2 +click==8.1.7 +cliff==4.5.0 cmd2==2.4.3 -cryptography==40.0.2 +cryptography==41.0.7 debtcollector==2.5.0 -Deckhand @ git+https://opendev.org/airship/deckhand.git@37ba567da5bf7f146f54a468478a025c70793574 +Deckhand @ git+https://opendev.org/airship/deckhand.git@5d2765e513fa55be74aef4456d6b353d24bc7097 decorator==5.1.1 -deepdiff==6.3.1 -dnspython==2.3.0 -dogpile.cache==1.2.2 -eventlet==0.33.3 -falcon==3.1.1 -fasteners==0.18 +deepdiff==6.7.1 +dnspython==2.4.2 +dogpile.cache==1.3.1 +eventlet==0.34.3 +falcon==3.1.3 +fasteners==0.19 fixtures==4.1.0 futurist==2.4.1 -google-auth==2.20.0 -greenlet==2.0.2 +google-auth==2.26.2 +greenlet==3.0.3 html5lib==0.9999999 httpexceptor==1.4.0 -idna==3.4 -importlib-metadata==4.13.0 -importlib-resources==5.12.0 -iso8601==2.0.0 -Jinja2==3.1.2 -jsonpath-ng==1.5.3 -jsonpickle==3.0.1 -jsonschema==4.17.3 +idna==3.6 +importlib-metadata==6.11.0 +importlib-resources==5.13.0 +iso8601==2.1.0 +Jinja2==3.1.3 +jsonpath-ng==1.6.1 +jsonpickle==3.0.2 +jsonschema==4.20.0 +jsonschema-specifications==2023.12.1 keystoneauth1==4.3.1 -keystonemiddleware==10.4.0 -kombu==5.3.0 +keystonemiddleware==10.5.0 +kombu==5.3.5 kubernetes==23.6.0 ldap3==2.9.1 logutils==0.3.5 -Mako==1.2.4 +Mako==1.3.0 MarkupSafe==2.1.3 -msgpack==1.0.5 -netaddr==0.8.0 +msgpack==1.0.7 +netaddr==1.2.1 netifaces==0.11.0 networkx==3.1 oauthlib==3.2.2 ordered-set==4.1.0 os-service-types==1.7.0 -oslo.cache==3.4.0 -oslo.concurrency==5.1.1 +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.i18n==6.0.0 +oslo.i18n==6.2.0 oslo.log==4.8.0 -oslo.messaging==14.3.1 -oslo.metrics==0.6.0 -oslo.middleware==5.1.1 +oslo.messaging==14.6.0 +oslo.metrics==0.7.0 +oslo.middleware==6.0.0 oslo.policy==3.10.1 oslo.serialization==4.1.0 -oslo.service==3.1.1 -oslo.upgradecheck==2.1.1 +oslo.service==3.3.0 +oslo.upgradecheck==2.2.0 oslo.utils==4.12.3 -oslo.versionedobjects==3.1.0 -packaging==21.3 -Paste==3.5.3 -PasteDeploy==3.0.1 -PasteScript==3.3.0 -pbr==5.11.1 +oslo.versionedobjects==3.2.0 +packaging==23.2 +Paste==3.7.1 +PasteDeploy==3.1.0 +PasteScript==3.4.0 +pbr==6.0.0 pecan==1.5.1 -pip==23.1.2 +pip==23.2.1 pkgutil_resolve_name==1.3.10 ply==3.11 -prettytable==3.8.0 -prometheus-client==0.17.0 -psycopg2-binary==2.9.6 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 +prettytable==3.10.0 +prometheus-client==0.19.0 +psycopg2-binary==2.9.9 +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.2.0 -pyparsing==3.0.9 +pyOpenSSL==23.3.0 +pyparsing==3.1.1 pyperclip==1.8.2 -pyrsistent==0.19.3 python-barbicanclient==5.4.0 python-dateutil==2.8.2 -python-keystoneclient==5.1.0 -python-memcached==1.59 +python-keystoneclient==5.3.0 +python-memcached==1.62 python-mimeparse==1.6.0 -pytz==2023.3 -PyYAML==6.0 +pytz==2023.3.post1 +PyYAML==6.0.1 +referencing==0.32.1 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 rsa==4.9 selector==0.10.1 -setuptools==67.7.2 -simplejson==3.19.1 +setuptools==68.2.2 +simplejson==3.19.2 six==1.16.0 -SQLAlchemy==1.4.48 +SQLAlchemy==1.4.51 sqlalchemy-migrate==0.13.0 sqlparse==0.4.4 statsd==4.0.1 @@ -116,18 +119,19 @@ stevedore==5.1.0 Tempita==0.5.2 testresources==2.0.1 testscenarios==0.5.0 -testtools==2.6.0 +testtools==2.7.1 tiddlyweb==2.4.3 -typing_extensions==4.6.3 -tzdata==2023.3 -urllib3==1.26.16 -uWSGI==2.0.22 -vine==5.0.0 -wcwidth==0.2.6 +typing_extensions==4.9.0 +tzdata==2023.4 +urllib3==1.26.18 +uWSGI==2.0.24 +vine==5.1.0 +wcwidth==0.2.13 WebOb==1.8.7 -websocket-client==1.5.3 +websocket-client==1.7.0 Werkzeug==2.2.3 -wheel==0.40.0 -wrapt==1.15.0 -yappi==1.4.0 -zipp==3.15.0 +wheel==0.41.2 +wrapt==1.16.0 +xattr==0.10.1 +yappi==1.6.0 +zipp==3.17.0 diff --git a/tox.ini b/tox.ini index ed4e5c67..60637152 100644 --- a/tox.ini +++ b/tox.ini @@ -77,7 +77,7 @@ allowlist_externals= sh deps= -r{toxinidir}/requirements-direct.txt - -c https://raw.githubusercontent.com/apache/airflow/constraints-2.6.2/constraints-3.8.txt + -c https://raw.githubusercontent.com/apache/airflow/constraints-2.8.1/constraints-3.8.txt commands= rm -f requirements-frozen.txt sh -c "pip freeze --all | grep -vE 'promenade|pyinotify|pkg-resources' > requirements-frozen.txt" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 40d09c58..26816f70 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -118,7 +118,7 @@ commit: true static: - latest - - airflow_2.6.2 + - airflow_2.8.1 irrelevant-files: - ^charts/.*$ - ^etc/.*$