diff --git a/.zuul.yaml b/.zuul.yaml index 09c569b3..fb31acb9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -247,7 +247,7 @@ commit: true static: - latest - - airflow_2.10.4 + - airflow_3.0.2 - secret: name: airship_pegleg_quay_creds diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 00000000..b337b549 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +filterwarnings = + ignore::pytest.PytestUnraisableExceptionWarning diff --git a/requirements-direct.txt b/requirements-direct.txt index ffc29301..f255a4b1 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -8,11 +8,12 @@ six debtcollector zipp psycopg2-binary +pytz # Airship dependencies -deckhand @ git+https://opendev.org/airship/deckhand.git@211b2d20c080ec806d196f3ec6b0d0472b00fa1b#egg=deckhand -shipyard-client @ git+https://opendev.org/airship/shipyard.git@40b424e82a6880136541af18b9b5752b4ebd9c96#egg=shipyard-client&subdirectory=src/bin/shipyard_client -promenade @ git+https://opendev.org/airship/promenade.git@eb9db6e50f109eac6b4b06e5fe645e1ec60b1ebe#egg=promenade +deckhand @ git+https://opendev.org/airship/deckhand.git@d8cc9f3ed2c9f2b9d9bf271a72c9bf301f16f647#egg=deckhand +shipyard-client @ git+https://opendev.org/airship/shipyard.git@95b37b822eaf8ad39c644f7007b2c1a07293e5ab#egg=shipyard-client&subdirectory=src/bin/shipyard_client +promenade @ git+https://opendev.org/airship/promenade.git@63bf9dd5693b6e1bf372addadab703cade80cce3#egg=promenade # Openstack Caracal 2024.1 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 7a7ba60d..5f965be1 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -1,55 +1,55 @@ -alembic==1.14.0 +alembic==1.16.1 amqp==5.3.1 arrow==1.3.0 -attrs==24.2.0 +attrs==25.3.0 autopage==0.5.2 barbican==18.0.0 -bcrypt==4.2.1 +bcrypt==4.3.0 Beaker==1.13.0 -cachetools==5.5.0 -castellan==5.2.0 -certifi==2024.8.30 +cachetools==5.5.2 +castellan==5.3.0 +certifi==2025.4.26 cffi==1.17.1 -charset-normalizer==3.4.0 -click==8.1.7 +charset-normalizer==3.4.2 +click==8.2.1 click-default-group==1.2.4 -cliff==4.8.0 -cmd2==2.5.8 +cliff==4.10.0 +cmd2==2.6.1 cryptography==42.0.8 debtcollector==3.0.0 -Deckhand @ git+https://opendev.org/airship/deckhand.git@211b2d20c080ec806d196f3ec6b0d0472b00fa1b -decorator==5.1.1 -deepdiff==8.1.1 +Deckhand @ git+https://opendev.org/airship/deckhand.git@d8cc9f3ed2c9f2b9d9bf271a72c9bf301f16f647 +decorator==5.2.1 +deepdiff==8.5.0 dnspython==2.7.0 docker==7.1.0 -dogpile.cache==1.3.3 -eventlet==0.38.1 +dogpile.cache==1.4.0 +durationpy==0.10 +eventlet==0.40.0 falcon==4.0.2 fasteners==0.19 -fixtures==4.1.0 +fixtures==4.2.5 Flask==2.2.5 -futurist==3.0.0 -gitdb==4.0.11 -GitPython==3.1.43 -google-auth==2.36.0 -greenlet==3.1.1 +futurist==3.1.1 +gitdb==4.0.12 +GitPython==3.1.44 +google-auth==2.40.2 +greenlet==3.2.2 html5lib==0.9999999 httpexceptor==1.4.0 idna==3.10 iso8601==2.1.0 itsdangerous==2.2.0 -Jinja2==3.1.4 +Jinja2==3.1.6 jsonpath-ng==1.7.0 jsonpickle==3.4.2 -jsonschema==4.23.0 -jsonschema-specifications==2023.12.1 +jsonschema==4.24.0 +jsonschema-specifications==2025.4.1 keystoneauth1==5.6.0 keystonemiddleware==10.6.0 -kombu==5.4.2 -kubernetes==30.1.0 +kombu==5.5.4 +kubernetes==31.0.0 ldap3==2.9.1 -logutils==0.3.5 -Mako==1.3.8 +Mako==1.3.10 MarkupSafe==3.0.2 microversion-parse==2.0.0 msgpack==1.1.0 @@ -57,7 +57,7 @@ netaddr==1.3.0 netifaces==0.11.0 networkx==3.4.2 oauthlib==3.2.2 -orderly-set==5.2.3 +orderly-set==5.4.1 os-service-types==1.7.0 oslo.cache==3.7.0 oslo.concurrency==6.0.0 @@ -75,69 +75,70 @@ oslo.service==3.4.1 oslo.upgradecheck==2.3.0 oslo.utils==7.1.0 oslo.versionedobjects==3.3.0 -packaging==24.2 +packaging==25.0 Paste==3.10.1 PasteDeploy==3.1.0 -PasteScript==3.6.0 -pbr==6.1.0 -pecan==1.5.1 -pip==24.1 +PasteScript==3.7.0 +pbr==6.1.1 +pecan==1.6.0 +pip==24.3.1 ply==3.11 -prettytable==3.12.0 -promenade @ git+https://opendev.org/airship/promenade.git@eb9db6e50f109eac6b4b06e5fe645e1ec60b1ebe -prometheus_client==0.21.1 +prettytable==3.16.0 +promenade @ git+https://opendev.org/airship/promenade.git@63bf9dd5693b6e1bf372addadab703cade80cce3 +prometheus_client==0.22.1 psycopg2-binary==2.9.10 PTable==0.9.2 pyasn1==0.6.1 -pyasn1_modules==0.4.0 -pycadf==4.0.0 +pyasn1_modules==0.4.1 +pycadf==4.0.1 pycparser==2.22 PyJWT==2.10.1 pylibyaml==0.1.0 -pyOpenSSL==24.3.0 -pyparsing==3.2.0 +pyOpenSSL==25.1.0 +pyparsing==3.2.3 pyperclip==1.9.0 python-barbicanclient==5.7.0 python-dateutil==2.9.0.post0 python-keystoneclient==5.4.0 python-memcached==1.62 python-mimeparse==2.0.0 -pytz==2024.2 +pytz==2025.2 PyYAML==6.0.2 -referencing==0.35.1 +referencing==0.36.2 repoze.lru==0.7 requests==2.32.3 -requests-oauthlib==1.3.1 +requests-oauthlib==2.0.0 resolver==0.2.1 rfc3986==2.0.0 Routes==2.5.1 -rpds-py==0.22.3 -rsa==4.9 +rpds-py==0.25.1 +rsa==4.9.1 selector==0.10.1 -setuptools==70.1.0 -shipyard_client @ git+https://opendev.org/airship/shipyard.git@40b424e82a6880136541af18b9b5752b4ebd9c96#subdirectory=src/bin/shipyard_client -simplejson==3.19.3 +setuptools==75.8.0 +shipyard_client @ git+https://opendev.org/airship/shipyard.git@95b37b822eaf8ad39c644f7007b2c1a07293e5ab#subdirectory=src/bin/shipyard_client +simplejson==3.20.1 six==1.17.0 -smmap==5.0.1 +smmap==5.0.2 SQLAlchemy==1.4.54 statsd==4.0.1 -stevedore==5.4.0 -testresources==2.0.1 +stevedore==5.4.1 +testresources==2.0.2 testscenarios==0.5.0 testtools==2.7.2 tiddlyweb==2.4.3 -types-python-dateutil==2.9.0.20241206 -typing_extensions==4.12.2 -tzdata==2024.2 -urllib3==2.2.3 -uWSGI==2.0.28 +tomli==2.2.1 +types-python-dateutil==2.9.0.20250516 +typing_extensions==4.13.2 +tzdata==2025.2 +urllib3==2.4.0 +uWSGI==2.0.30 vine==5.1.0 wcwidth==0.2.13 WebOb==1.8.9 websocket-client==1.8.0 Werkzeug==2.2.3 -wheel==0.43.0 -wrapt==1.17.0 +wheel==0.45.1 +wrapt==1.17.2 xattr==0.10.1 yappi==1.6.10 -zipp==3.21.0 +zipp==3.22.0 diff --git a/tox.ini b/tox.ini index d9cf8282..588d4e0a 100644 --- a/tox.ini +++ b/tox.ini @@ -101,7 +101,7 @@ allowlist_externals= sh deps= -r{toxinidir}/requirements-direct.txt - -c https://raw.githubusercontent.com/apache/airflow/constraints-2.10.4/constraints-3.10.txt + -c https://raw.githubusercontent.com/apache/airflow/constraints-3.0.2/constraints-3.10.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 dc41ddda..fa392a32 100644 --- a/vcs-requirements.env +++ b/vcs-requirements.env @@ -1,3 +1,3 @@ -DECKHAND_VERSION=commit/211b2d20c080ec806d196f3ec6b0d0472b00fa1b -SHIPYARD_VERSION=commit/40b424e82a6880136541af18b9b5752b4ebd9c96 -PROMENADE_VERSION=commit/eb9db6e50f109eac6b4b06e5fe645e1ec60b1ebe +DECKHAND_VERSION=commit/d8cc9f3ed2c9f2b9d9bf271a72c9bf301f16f647 +SHIPYARD_VERSION=commit/95b37b822eaf8ad39c644f7007b2c1a07293e5ab +PROMENADE_VERSION=commit/63bf9dd5693b6e1bf372addadab703cade80cce3