From cc9870f204e0f7835e0d07139838faae794f0e15 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 10 May 2023 11:03:41 +0200 Subject: [PATCH] Update airflow version to 2.5.3 in requirements; updated pip-tools to 6.13.0 Change-Id: I9af85b61d44259630ac6703e84d7232be8731154 Signed-off-by: garciadeblas --- osm_webhook_translator/requirements.txt | 12 +++--- requirements-dev.in | 2 +- requirements-dev.txt | 57 +++++++++---------------- requirements-test.txt | 4 +- requirements.txt | 26 +++++------ tox.ini | 4 +- 6 files changed, 41 insertions(+), 64 deletions(-) diff --git a/osm_webhook_translator/requirements.txt b/osm_webhook_translator/requirements.txt index c8d78fa..aab3c69 100644 --- a/osm_webhook_translator/requirements.txt +++ b/osm_webhook_translator/requirements.txt @@ -16,7 +16,7 @@ ####################################################################################### anyio==3.6.2 # via starlette -certifi==2022.12.7 +certifi==2023.5.7 # via requests charset-normalizer==3.1.0 # via requests @@ -32,17 +32,15 @@ idna==3.4 # requests pydantic==1.10.7 # via fastapi -requests==2.29.0 +requests==2.30.0 # via -r osm_webhook_translator/requirements.in sniffio==1.3.0 # via anyio starlette==0.26.1 # via fastapi typing-extensions==4.5.0 - # via - # pydantic - # starlette -urllib3==1.26.15 + # via pydantic +urllib3==2.0.2 # via requests -uvicorn==0.21.1 +uvicorn==0.22.0 # via -r osm_webhook_translator/requirements.in diff --git a/requirements-dev.in b/requirements-dev.in index 8434f0e..bb16c88 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -17,4 +17,4 @@ git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -apache-airflow==2.5.* +apache-airflow==2.5.3 diff --git a/requirements-dev.txt b/requirements-dev.txt index a82e656..cd40b8f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -65,7 +65,7 @@ cachelib==0.9.0 # flask-session cattrs==22.2.0 # via apache-airflow -certifi==2022.12.7 +certifi==2023.5.7 # via # httpcore # httpx @@ -91,7 +91,7 @@ configupdater==3.1.1 # via apache-airflow connexion[flask]==2.14.2 # via apache-airflow -cron-descriptor==1.2.35 +cron-descriptor==1.3.0 # via apache-airflow croniter==1.3.14 # via apache-airflow @@ -104,14 +104,17 @@ deprecated==1.2.13 dill==0.3.6 # via apache-airflow dnspython==2.3.0 - # via email-validator -docutils==0.19 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master + # email-validator + # pymongo +docutils==0.20 # via python-daemon email-validator==1.3.1 # via flask-appbuilder exceptiongroup==1.1.1 # via cattrs -flask==2.2.4 +flask==2.2.5 # via # apache-airflow # connexion @@ -135,7 +138,7 @@ flask-login==0.6.2 # via # apache-airflow # flask-appbuilder -flask-session==0.4.0 +flask-session==0.4.1 # via apache-airflow flask-sqlalchemy==2.5.1 # via flask-appbuilder @@ -166,17 +169,6 @@ idna==3.4 # httpx # requests # yarl -importlib-metadata==4.13.0 - # via - # alembic - # apache-airflow - # flask - # markdown -importlib-resources==5.12.0 - # via - # alembic - # apache-airflow - # jsonschema inflection==0.5.1 # via connexion itsdangerous==2.1.2 @@ -202,7 +194,7 @@ kafka-python==2.0.2 # aiokafka lazy-object-proxy==1.9.0 # via apache-airflow -linkify-it-py==2.0.0 +linkify-it-py==2.0.2 # via apache-airflow lockfile==0.12.2 # via @@ -240,7 +232,7 @@ mdit-py-plugins==0.3.5 # via apache-airflow mdurl==0.1.2 # via markdown-it-py -motor==1.3.1 +motor==3.1.2 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master multidict==6.0.4 # via @@ -248,7 +240,7 @@ multidict==6.0.4 # yarl osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master # via -r requirements-dev.in -packaging==23.0 +packaging==23.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka @@ -259,8 +251,6 @@ pathspec==0.9.0 # via apache-airflow pendulum==2.1.2 # via apache-airflow -pkgutil-resolve-name==1.3.10 - # via jsonschema pluggy==1.0.0 # via apache-airflow prison==0.2.1 @@ -275,12 +265,12 @@ pygments==2.15.1 # via # apache-airflow # rich -pyjwt==2.6.0 +pyjwt==2.7.0 # via # apache-airflow # flask-appbuilder # flask-jwt-extended -pymongo==3.13.0 +pymongo==4.3.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor @@ -301,9 +291,7 @@ python-slugify==8.0.1 # apache-airflow # python-nvd3 pytz==2023.3 - # via - # babel - # flask-babel + # via flask-babel pytzdata==2020.1 # via pendulum pyyaml==5.4.1 @@ -312,12 +300,12 @@ pyyaml==5.4.1 # apispec # clickclick # connexion -requests==2.29.0 +requests==2.30.0 # via # apache-airflow-providers-http # connexion # requests-toolbelt -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via apache-airflow-providers-http rfc3339-validator==0.1.4 # via apache-airflow @@ -335,7 +323,7 @@ sniffio==1.3.0 # anyio # httpcore # httpx -sqlalchemy==1.4.47 +sqlalchemy==1.4.48 # via # alembic # apache-airflow @@ -362,12 +350,11 @@ typing-extensions==4.5.0 # via # alembic # apache-airflow - # rich -uc-micro-py==1.0.1 +uc-micro-py==1.0.2 # via linkify-it-py unicodecsv==0.14.1 # via apache-airflow -urllib3==1.26.15 +urllib3==2.0.2 # via requests werkzeug==2.2.3 # via @@ -384,10 +371,6 @@ wtforms==3.0.1 # flask-wtf yarl==1.9.2 # via aiohttp -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements-test.txt b/requirements-test.txt index dc5a646..295394e 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.2.3 +coverage==7.2.5 # via -r requirements-test.in mock==5.0.2 # via -r requirements-test.in -nose2==0.12.0 +nose2==0.13.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 953edd4..8895b22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,11 +33,9 @@ azure-mgmt-compute==29.1.0 # via -r requirements.in azure-mgmt-core==1.4.0 # via azure-mgmt-compute -backports-zoneinfo==0.2.1;python_version<"3.9" - # via tzlocal cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via # msrest # requests @@ -45,7 +43,7 @@ cffi==1.15.1 # via cryptography charset-normalizer==3.1.0 # via requests -cliff==4.2.0 +cliff==4.3.0 # via gnocchiclient cmd2==2.4.3 # via cliff @@ -96,8 +94,6 @@ idna==3.4 # via requests importlib-metadata==6.6.0 # via cliff -importlib-resources==5.12.0 - # via matplotlib iso8601==1.1.0 # via # gnocchiclient @@ -194,7 +190,7 @@ prometheus-api-client==0.5.3 # via -r requirements.in prometheus-client==0.16.0 # via -r requirements.in -protobuf==4.22.3 +protobuf==4.23.0 # via # google-api-core # googleapis-common-protos @@ -206,7 +202,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.7.0 # via msal pyparsing==3.0.9 # via @@ -240,9 +236,9 @@ pyyaml==5.4.1 # -r requirements.in # cliff # oslo-config -regex==2023.3.23 +regex==2023.5.5 # via dateparser -requests==2.29.0 +requests==2.30.0 # via # azure-core # google-api-core @@ -284,20 +280,20 @@ stevedore==5.0.0 typing-extensions==4.5.0 # via azure-core tzdata==2023.3 - # via pandas + # via + # pandas + # pytz-deprecation-shim tzlocal==4.3 # via dateparser ujson==5.7.0 # via gnocchiclient uritemplate==4.1.1 # via google-api-python-client -urllib3==1.26.15 +urllib3==2.0.2 # via requests wcwidth==0.2.6 # via cmd2 wrapt==1.15.0 # via debtcollector zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources + # via importlib-metadata diff --git a/tox.ini b/tox.ini index 6c750c9..36637f8 100644 --- a/tox.ini +++ b/tox.ini @@ -92,7 +92,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash @@ -101,7 +101,7 @@ commands = bash -c "for file in requirements*.in ; do \ UNSAFE="" ; \ if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \ - pip-compile -rU --no-header $UNSAFE $file ;\ + pip-compile -rU --resolver=backtracking --no-header $UNSAFE $file ;\ out=`echo $file | sed 's/.in/.txt/'` ; \ sed -i -e '1 e head -16 tox.ini' $out ;\ done" -- 2.25.1