From 63dc6484e74116561919c0447debe2be87da3ef0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 29 Sep 2023 08:04:39 +0200 Subject: [PATCH] Update pip requirements to pass stage2 and stage3 in all modules Change-Id: Icd95b140b2916df73668dc5bc09f618255c33576 Signed-off-by: garciadeblas --- requirements-dev.txt | 34 +++++++------- requirements-test.txt | 14 +++--- requirements.txt | 104 +++++++++++++++++++++--------------------- tox.ini | 4 +- 4 files changed, 79 insertions(+), 77 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a5013a1..ea62ee3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,9 +18,9 @@ # via -r requirements-dev.in -e git+https://osm.etsi.org/gerrit/osm/common.git@master#egg=osm-common # via -r requirements-dev.in -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 @@ -30,31 +30,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 @@ -86,7 +86,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 f71d256..a2e1554 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,27 +14,27 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements-test.in # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements-test.in # requests -coverage==7.2.5 +coverage==7.3.1 # via -r requirements-test.in idna==3.4 # via requests -mock==5.0.2 +mock==5.1.0 # via -r requirements-test.in nose2==0.13.0 # via -r requirements-test.in -requests==2.30.0 +requests==2.31.0 # via requests-mock -requests-mock==1.10.0 +requests-mock==1.11.0 # via -r requirements-test.in six==1.16.0 # via requests-mock -urllib3==2.0.2 +urllib3==2.0.5 # via requests diff --git a/requirements.txt b/requirements.txt index 89c705f..1a8c97d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,25 +14,25 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.8.0 +aiokafka==0.8.1 # via -r requirements.in appdirs==1.4.4 # via openstacksdk -async-timeout==4.0.2 +async-timeout==4.0.3 # via aiokafka attrs==23.1.0 # via cmd2 autopage==0.5.1 # via cliff -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements.in # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements.in # cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements.in # requests @@ -43,13 +43,13 @@ cliff==4.3.0 # python-neutronclient cmd2==2.4.3 # via cliff -contourpy==1.0.7 +contourpy==1.1.1 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.4 # via # -r requirements.in # openstacksdk -cycler==0.11.0 +cycler==0.12.0 # via matplotlib dateparser==1.1.8 # via prometheus-api-client @@ -66,9 +66,9 @@ decorator==5.1.1 # via # dogpile-cache # openstacksdk -dogpile-cache==1.2.0 +dogpile-cache==1.2.2 # via openstacksdk -fonttools==4.39.4 +fonttools==4.42.1 # via matplotlib futurist==2.4.1 # via gnocchiclient @@ -82,9 +82,9 @@ humanfriendly==10.0 # pyvcloud idna==3.4 # via requests -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 # via cliff -iso8601==1.1.0 +iso8601==2.0.0 # via # gnocchiclient # keystoneauth1 @@ -95,13 +95,13 @@ iso8601==1.1.0 # python-novaclient jmespath==1.0.1 # via openstacksdk -jsonpatch==1.32 +jsonpatch==1.33 # via openstacksdk -jsonpointer==2.3 +jsonpointer==2.4 # via jsonpatch kafka-python==2.0.2 # via aiokafka -keystoneauth1==5.1.2 +keystoneauth1==5.3.0 # via # gnocchiclient # openstacksdk @@ -111,18 +111,18 @@ keystoneauth1==5.1.2 # python-keystoneclient # python-neutronclient # python-novaclient -kiwisolver==1.4.4 +kiwisolver==1.4.5 # via matplotlib -lxml==4.9.2 +lxml==4.9.3 # via # -r requirements.in # pyvcloud # unittest-xml-reporting -matplotlib==3.7.1 +matplotlib==3.8.0 # via prometheus-api-client -msgpack==1.0.5 +msgpack==1.0.7 # via oslo-serialization -netaddr==0.8.0 +netaddr==0.9.0 # via # oslo-config # oslo-utils @@ -131,13 +131,13 @@ netifaces==0.11.0 # via # openstacksdk # oslo-utils -numpy==1.24.3 +numpy==1.26.0 # via # contourpy # matplotlib # pandas # prometheus-api-client -openstacksdk==1.1.0 +openstacksdk==1.5.0 # via # os-client-config # osc-lib @@ -148,15 +148,15 @@ os-service-types==1.7.0 # via # keystoneauth1 # openstacksdk -osc-lib==2.8.0 +osc-lib==2.8.1 # via python-neutronclient -oslo-config==9.1.1 +oslo-config==9.2.0 # via # oslo-log # python-keystoneclient -oslo-context==5.1.1 +oslo-context==5.2.0 # via oslo-log -oslo-i18n==6.0.0 +oslo-i18n==6.1.0 # via # osc-lib # oslo-config @@ -167,16 +167,16 @@ oslo-i18n==6.0.0 # python-keystoneclient # python-neutronclient # python-novaclient -oslo-log==5.2.0 +oslo-log==5.3.0 # via python-neutronclient -oslo-serialization==5.1.1 +oslo-serialization==5.2.0 # via # oslo-log # python-ceilometerclient # python-keystoneclient # python-neutronclient # python-novaclient -oslo-utils==6.1.0 +oslo-utils==6.2.1 # via # osc-lib # oslo-log @@ -193,7 +193,7 @@ packaging==23.1 # oslo-utils # python-keystoneclient # pyvcloud -pandas==2.0.1 +pandas==2.1.1 # via prometheus-api-client pbr==5.11.1 # via @@ -211,7 +211,7 @@ pbr==5.11.1 # python-neutronclient # python-novaclient # stevedore -pillow==9.5.0 +pillow==10.0.1 # via matplotlib prettytable==0.7.2 # via @@ -219,17 +219,17 @@ prettytable==0.7.2 # python-ceilometerclient # python-cinderclient # python-novaclient -prometheus-api-client==0.5.3 +prometheus-api-client==0.5.4 # via -r requirements.in -prometheus-client==0.16.0 +prometheus-client==0.17.1 # via -r requirements.in pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via pyvcloud pyinotify==0.9.6 # via oslo-log -pyparsing==3.0.9 +pyparsing==3.1.1 # via # matplotlib # oslo-utils @@ -247,22 +247,20 @@ python-dateutil==2.8.2 # oslo-log # pandas # pyvcloud -python-keystoneclient==5.1.0 +python-keystoneclient==5.2.0 # via # -r requirements.in # python-neutronclient -python-neutronclient==10.0.0 +python-neutronclient==11.0.0 # via -r requirements.in -python-novaclient==18.3.0 +python-novaclient==18.4.0 # via -r requirements.in -pytz==2023.3 +pytz==2023.3.post1 # via # dateparser # oslo-serialization # oslo-utils # pandas -pytz-deprecation-shim==0.1.0.post0 - # via tzlocal pyvcloud==23.0.4 # via -r requirements.in pyyaml==6.0.1 @@ -272,9 +270,9 @@ pyyaml==6.0.1 # openstacksdk # oslo-config # pyvcloud -regex==2023.5.5 +regex==2023.8.8 # via dateparser -requests==2.30.0 +requests==2.31.0 # via # -r requirements.in # httmock @@ -299,11 +297,10 @@ six==1.16.0 # via # -r requirements.in # gnocchiclient - # keystoneauth1 # python-ceilometerclient # python-dateutil # python-keystoneclient -stevedore==5.0.0 +stevedore==5.1.0 # via # cliff # dogpile-cache @@ -314,21 +311,26 @@ stevedore==5.0.0 # python-cinderclient # python-keystoneclient # python-novaclient +typing-extensions==4.8.0 + # via dogpile-cache tzdata==2023.3 - # via pandas -tzlocal==4.3 + # via + # oslo-serialization + # oslo-utils + # pandas +tzlocal==5.0.1 # via dateparser -ujson==5.7.0 +ujson==5.8.0 # via gnocchiclient unittest-xml-reporting==3.2.0 # via pyvcloud -urllib3==2.0.2 +urllib3==2.0.5 # via requests vcd-api-schemas-type==10.3.0.dev72 # via pyvcloud -wcwidth==0.2.6 +wcwidth==0.2.7 # via cmd2 wrapt==1.15.0 # via debtcollector -zipp==3.15.0 +zipp==3.17.0 # via importlib-metadata diff --git a/tox.ini b/tox.ini index 21c559d..8f9952c 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