From 6a8c781a4eede1eb70fb1754086082eb356830ad Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 29 Sep 2023 08:07:00 +0200 Subject: [PATCH] Update pip requirements to pass stage2 and stage3 in all modules Change-Id: I574d227629056298a4d5cd67105dd9fcdb99d424 Signed-off-by: garciadeblas --- requirements-dev.txt | 34 +++++++++++++++++----------------- requirements-test.txt | 4 ++-- requirements.txt | 26 ++++++++++++++++---------- tox.ini | 4 ++-- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index db53376..e41ff3f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.8.0 +aiokafka==0.8.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -async-timeout==4.0.2 +async-timeout==4.0.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master @@ -26,31 +26,31 @@ bcrypt==4.0.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # paramiko -cachetools==5.3.0 +cachetools==5.3.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # kubernetes # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # requests -cryptography==40.0.2 +cryptography==41.0.4 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # paramiko dataclasses==0.6 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -dnspython==2.3.0 +dnspython==2.4.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master @@ -82,7 +82,7 @@ macaroonbakery==1.3.1 # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # juju # theblues -motor==3.1.2 +motor==3.3.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master @@ -124,13 +124,13 @@ pycparser==2.21 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # cffi -pycryptodome==3.17 +pycryptodome==3.19.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master pymacaroons==0.13.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # macaroonbakery -pymongo==4.3.3 +pymongo==4.5.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master @@ -150,7 +150,7 @@ python-dateutil==2.8.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # pyrfc3339 @@ -161,7 +161,7 @@ pyyaml==6.0.1 # juju # jujubundlelib # kubernetes -requests==2.30.0 +requests==2.31.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # kubernetes @@ -195,20 +195,20 @@ toposort==1.10 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # juju -typing-extensions==4.5.0 +typing-extensions==4.8.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # typing-inspect -typing-inspect==0.8.0 +typing-inspect==0.9.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # juju -urllib3==2.0.2 +urllib3==2.0.5 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # kubernetes # requests -websocket-client==1.5.1 +websocket-client==1.6.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/N2VC.git;a=blob_plain;f=requirements.txt;hb=master # kubernetes diff --git a/requirements-test.txt b/requirements-test.txt index bd7b303..1508ada 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -16,9 +16,9 @@ ####################################################################################### asynctest==0.13.0 # via -r requirements-test.in -coverage==7.2.5 +coverage==7.3.1 # via -r requirements-test.in -mock==5.0.2 +mock==5.1.0 # via -r requirements-test.in nose2==0.13.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 56ad71a..67d6297 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,11 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiohttp==3.8.4 +aiohttp==3.8.5 # via -r requirements.in aiosignal==1.3.1 # via aiohttp -async-timeout==4.0.2 +annotated-types==0.5.0 + # via pydantic +async-timeout==4.0.3 # via # -r requirements.in # aiohttp @@ -30,7 +32,7 @@ boltons==23.0.0 # via # face # glom -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via aiohttp checksumdir==1.2.0 # via -r requirements.in @@ -38,17 +40,17 @@ config-man==0.0.4 # via -r requirements.in face==20.1.1 # via glom -frozenlist==1.3.3 +frozenlist==1.4.0 # via # aiohttp # aiosignal glom==23.3.0 # via config-man -grpcio==1.54.2 +grpcio==1.58.0 # via grpcio-tools grpcio-tools==1.48.1 # via -r requirements.in -grpclib==0.4.4 +grpclib==0.4.5 # via -r requirements.in h2==4.1.0 # via grpclib @@ -62,7 +64,7 @@ idna==3.4 # yarl jinja2==3.1.2 # via -r requirements.in -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 multidict==6.0.4 # via @@ -73,12 +75,16 @@ protobuf==3.20.3 # via # -r requirements.in # grpcio-tools -pydantic==1.10.7 +pydantic==2.4.2 # via -r requirements.in +pydantic-core==2.10.1 + # via pydantic pyyaml==6.0.1 # via -r requirements.in -typing-extensions==4.5.0 - # via pydantic +typing-extensions==4.8.0 + # via + # pydantic + # pydantic-core yarl==1.9.2 # via aiohttp diff --git a/tox.ini b/tox.ini index 0e0eef4..fe8a0ec 100644 --- a/tox.ini +++ b/tox.ini @@ -83,7 +83,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash [ @@ -91,7 +91,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 --resolver=backtracking -rU --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