From 15b611d61766a902af36cce17521fd79ff018421 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 3 Oct 2023 14:20:01 +0200 Subject: [PATCH] Update pip requirements to pass stage2 and stage3 in all modules Change-Id: I3512d3f6c6cff4ec60bd38a6ecd1c4322cdad1ca Signed-off-by: garciadeblas --- ...ate_pip_requirements-ed3574873416fe35.yaml | 22 ++ requirements-dev.txt | 16 +- requirements-test.txt | 4 +- requirements.in | 1 + requirements.txt | 193 ++++++++---------- tox.ini | 6 +- 6 files changed, 126 insertions(+), 116 deletions(-) create mode 100644 releasenotes/notes/update_pip_requirements-ed3574873416fe35.yaml diff --git a/releasenotes/notes/update_pip_requirements-ed3574873416fe35.yaml b/releasenotes/notes/update_pip_requirements-ed3574873416fe35.yaml new file mode 100644 index 00000000..09cdf063 --- /dev/null +++ b/releasenotes/notes/update_pip_requirements-ed3574873416fe35.yaml @@ -0,0 +1,22 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +####################################################################################### +--- +other: + - | + Update pip requirements. It also pins pylint version to 2.17.7, so that + it does not present issues with ne version 3.0.0, which still has bugs. + diff --git a/requirements-dev.txt b/requirements-dev.txt index 6a76f0ff..29259383 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,19 +14,23 @@ # 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=v14.0 -async-timeout==4.0.2 +async-timeout==4.0.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 # aiokafka dataclasses==0.6 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 +dnspython==2.4.2 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 + # pymongo kafka-python==2.0.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 # aiokafka -motor==3.1.2 +motor==3.3.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@v14.0 # via -r requirements-dev.in @@ -34,11 +38,11 @@ packaging==23.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 # aiokafka -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=v14.0 -pymongo==4.3.3 +pymongo==4.5.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 # motor pyyaml==6.0.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v14.0 diff --git a/requirements-test.txt b/requirements-test.txt index d0375539..1b42315c 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -16,9 +16,9 @@ ####################################################################################### -e RO-plugin # via -r requirements-test.in -coverage==7.2.5 +coverage==7.3.2 # 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.in b/requirements.in index ded4a405..209a59c0 100644 --- a/requirements.in +++ b/requirements.in @@ -33,4 +33,5 @@ -r RO-VIM-vmware/requirements.in -r RO-VIM-gcp/requirements.in +packaging==23.1 pyyaml>6 diff --git a/requirements.txt b/requirements.txt index ae1af3b3..8aaba314 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,12 +18,13 @@ adal==1.2.7 # via msrestazure appdirs==1.4.4 # via openstacksdk -atpublic==3.1.1 +atpublic==4.0 # via flufl-enum attrs==23.1.0 # via # cmd2 # jsonschema + # referencing autopage==0.5.1 # via cliff azure-common==1.1.28 @@ -32,41 +33,41 @@ azure-common==1.1.28 # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource -azure-core==1.26.4 +azure-core==1.29.4 # via # azure-identity # azure-mgmt-core # msrest -azure-identity==1.12.0 +azure-identity==1.14.0 # via -r RO-VIM-azure/requirements.in -azure-mgmt-compute==29.1.0 +azure-mgmt-compute==30.3.0 # via -r RO-VIM-azure/requirements.in azure-mgmt-core==1.4.0 # via # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource -azure-mgmt-network==23.0.1 +azure-mgmt-network==25.1.0 # via -r RO-VIM-azure/requirements.in -azure-mgmt-resource==23.0.0 +azure-mgmt-resource==23.0.1 # via -r RO-VIM-azure/requirements.in bcrypt==4.0.1 # via paramiko boto==2.49.0 # via -r RO-VIM-aws/requirements.in -cachetools==5.3.0 +cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via # msrest # requests -cffi==1.15.1 +cffi==1.16.0 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.3.0 # via requests -cheroot==9.0.0 +cheroot==10.0.0 # via cherrypy cherrypy==18.1.2 # via -r NG-RO/requirements.in @@ -77,7 +78,7 @@ cliff==4.3.0 # python-openstackclient cmd2==2.4.3 # via cliff -cryptography==40.0.2 +cryptography==41.0.4 # via # -r NG-RO/requirements.in # adal @@ -87,6 +88,7 @@ cryptography==40.0.2 # paramiko # pyjwt # pyopenssl + # python-openstackclient cvprac==1.3.1 # via -r RO-SDN-arista_cloudvision/requirements.in debtcollector==2.5.0 @@ -101,25 +103,25 @@ decorator==5.1.1 # via # dogpile-cache # openstacksdk -dogpile-cache==1.2.0 +dogpile-cache==1.2.2 # via openstacksdk -flufl-enum==5.0.1 +flufl-enum==6.0.2 # via pyvcloud -google-api-core==2.11.0 +google-api-core==2.12.0 # via google-api-python-client -google-api-python-client==2.86.0 +google-api-python-client==2.101.0 # via -r RO-VIM-gcp/requirements.in -google-auth==2.17.3 +google-auth==2.23.2 # via # -r RO-VIM-gcp/requirements.in # google-api-core # google-api-python-client # google-auth-httplib2 -google-auth-httplib2==0.1.0 +google-auth-httplib2==0.1.1 # via google-api-python-client google-cloud==0.34.0 # via -r RO-VIM-gcp/requirements.in -googleapis-common-protos==1.59.0 +googleapis-common-protos==1.60.0 # via google-api-core httplib2==0.22.0 # via @@ -129,15 +131,13 @@ humanfriendly==10.0 # via pyvcloud idna==3.4 # via requests -importlib-metadata==6.6.0 +importlib-metadata==6.8.0 # via # -r NG-RO/requirements.in # cliff -importlib-resources==5.12.0 - # via jsonschema ipconflict==0.5.0 # via -r RO-VIM-aws/requirements.in -iso8601==1.1.0 +iso8601==2.1.0 # via # keystoneauth1 # openstacksdk @@ -147,10 +147,11 @@ iso8601==1.1.0 # python-openstackclient isodate==0.6.1 # via + # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource # msrest -jaraco-functools==3.6.0 +jaraco-functools==3.9.0 # via # cheroot # tempora @@ -158,15 +159,17 @@ jinja2==3.1.2 # via -r NG-RO/requirements.in jmespath==1.0.1 # via openstacksdk -jsonpatch==1.32 +jsonpatch==1.33 # via # openstacksdk # warlock -jsonpointer==2.3 +jsonpointer==2.4 # via jsonpatch -jsonschema==4.17.3 +jsonschema==4.19.1 # via warlock -keystoneauth1==5.1.2 +jsonschema-specifications==2023.7.1 + # via jsonschema +keystoneauth1==5.3.0 # via # openstacksdk # osc-lib @@ -177,38 +180,33 @@ keystoneauth1==5.1.2 # python-novaclient logutils==0.3.5 # via -r NG-RO/requirements.in -lxml==4.9.2 +lxml==4.9.3 # via pyvcloud -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 -more-itertools==9.1.0 +more-itertools==10.1.0 # via # cheroot # cherrypy # jaraco-functools -msal==1.22.0 +msal==1.24.1 # via # azure-identity # msal-extensions msal-extensions==1.0.0 # via azure-identity -msgpack==1.0.5 +msgpack==1.0.7 # via oslo-serialization msrest==0.7.1 # via # -r RO-VIM-azure/requirements.in - # azure-mgmt-compute # msrestazure msrestazure==0.6.4 # via -r RO-VIM-azure/requirements.in -netaddr==0.8.0 +netaddr==0.9.0 # via # -r RO-VIM-aws/requirements.in - # -r RO-VIM-azure/requirements.in # -r RO-VIM-gcp/requirements.in - # -r RO-VIM-openstack/requirements.in - # -r RO-VIM-openvim/requirements.in - # -r RO-VIM-vmware/requirements.in # ipconflict # oslo-config # oslo-utils @@ -219,10 +217,11 @@ netifaces==0.11.0 # oslo-utils oauthlib==3.2.2 # via requests-oauthlib -openstacksdk==1.1.0 +openstacksdk==1.5.0 # via # os-client-config # osc-lib + # python-neutronclient # python-openstackclient os-client-config==2.1.0 # via python-neutronclient @@ -230,17 +229,17 @@ os-service-types==1.7.0 # via # keystoneauth1 # openstacksdk -osc-lib==2.8.0 +osc-lib==2.8.1 # via # python-neutronclient # python-openstackclient -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 @@ -252,15 +251,15 @@ oslo-i18n==6.0.0 # python-neutronclient # python-novaclient # python-openstackclient -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-keystoneclient # python-neutronclient # python-novaclient -oslo-utils==6.1.0 +oslo-utils==6.2.1 # via # osc-lib # oslo-log @@ -273,11 +272,11 @@ oslo-utils==6.1.0 # python-openstackclient packaging==23.1 # via + # -r requirements.in # oslo-utils # python-keystoneclient -paramiko==3.1.0 +paramiko==3.3.1 # via - # -r RO-SDN-dpb/requirements.in # -r RO-VIM-gcp/requirements.in # -r RO-plugin/requirements.in pbr==5.11.1 @@ -297,13 +296,11 @@ pbr==5.11.1 # python-novaclient # python-openstackclient # stevedore -pkgutil-resolve-name==1.3.10 - # via jsonschema -portalocker==2.7.0 +portalocker==2.8.2 # via msal-extensions -portend==3.1.0 +portend==3.2.0 # via cherrypy -prettytable==3.7.0 +prettytable==3.9.0 # via # -r RO-VIM-vmware/requirements.in # cliff @@ -312,7 +309,7 @@ prettytable==3.7.0 # python-novaclient progressbar==2.5 # via -r RO-VIM-vmware/requirements.in -protobuf==4.23.0 +protobuf==4.24.3 # via # google-api-core # googleapis-common-protos @@ -326,26 +323,24 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via pyvcloud pyinotify==0.9.6 # via oslo-log -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.8.0 # via # adal # msal pynacl==1.5.0 # via paramiko -pyopenssl==23.1.1 +pyopenssl==23.2.0 # via python-glanceclient -pyparsing==3.0.9 +pyparsing==3.1.1 # via # httplib2 # oslo-utils pyperclip==1.8.2 # via cmd2 -pyrsistent==0.19.3 - # via jsonschema pysocks==1.7.1 # via requests python-cinderclient==7.4.1 @@ -356,63 +351,47 @@ python-dateutil==2.8.2 # via # adal # oslo-log -python-glanceclient==4.3.0 +python-glanceclient==4.4.0 # via -r RO-VIM-openstack/requirements.in -python-keystoneclient==5.1.0 +python-keystoneclient==5.2.0 # via # -r RO-VIM-openstack/requirements.in # python-neutronclient # python-openstackclient -python-neutronclient==9.0.0 +python-neutronclient==11.0.0 # via -r RO-VIM-openstack/requirements.in -python-novaclient==18.3.0 +python-novaclient==18.4.0 # via # -r NG-RO/requirements.in # -r RO-VIM-openstack/requirements.in # python-openstackclient -python-openstackclient==6.2.0 +python-openstackclient==6.3.0 # via -r RO-VIM-openstack/requirements.in -pytz==2023.3 +pytz==2023.3.post1 # via # oslo-serialization # oslo-utils # tempora pyvcloud==19.1.1 # via -r RO-VIM-vmware/requirements.in -pyvmomi==8.0.1.0 +pyvmomi==8.0.2.0 # via -r RO-VIM-vmware/requirements.in pyyaml==6.0.1 # via # -r NG-RO/requirements.in - # -r RO-VIM-aws/requirements.in - # -r RO-VIM-azure/requirements.in - # -r RO-VIM-openstack/requirements.in - # -r RO-VIM-openvim/requirements.in - # -r RO-VIM-vmware/requirements.in - # -r RO-plugin/requirements.in # -r requirements.in # cliff # openstacksdk # oslo-config # pyvcloud -requests[socks]==2.30.0 +referencing==0.30.2 + # via + # jsonschema + # jsonschema-specifications +requests[socks]==2.31.0 # via # -r NG-RO/requirements.in - # -r RO-SDN-arista_cloudvision/requirements.in - # -r RO-SDN-dpb/requirements.in - # -r RO-SDN-dynpac/requirements.in - # -r RO-SDN-floodlight_openflow/requirements.in - # -r RO-SDN-ietfl2vpn/requirements.in - # -r RO-SDN-juniper_contrail/requirements.in - # -r RO-SDN-odl_openflow/requirements.in - # -r RO-SDN-onos_openflow/requirements.in - # -r RO-SDN-onos_vpls/requirements.in - # -r RO-VIM-aws/requirements.in - # -r RO-VIM-azure/requirements.in - # -r RO-VIM-openstack/requirements.in - # -r RO-VIM-openvim/requirements.in # -r RO-VIM-vmware/requirements.in - # -r RO-plugin/requirements.in # adal # azure-core # cvprac @@ -433,6 +412,10 @@ requestsexceptions==1.4.0 # via openstacksdk rfc3986==2.0.0 # via oslo-config +rpds-py==0.10.3 + # via + # jsonschema + # referencing rsa==4.9 # via google-auth simplejson==3.19.1 @@ -443,17 +426,12 @@ simplejson==3.19.1 six==1.16.0 # via # azure-core - # azure-identity - # cheroot - # google-auth - # google-auth-httplib2 # isodate - # keystoneauth1 # msrestazure # python-dateutil # python-keystoneclient # pyvmomi -stevedore==5.0.0 +stevedore==5.1.0 # via # cliff # dogpile-cache @@ -464,21 +442,28 @@ stevedore==5.0.0 # python-keystoneclient # python-novaclient # python-openstackclient -tempora==5.2.2 +tempora==5.5.0 # via portend -tqdm==4.65.0 +tqdm==4.66.1 # via ipconflict -typing-extensions==4.5.0 - # via azure-core +typing-extensions==4.8.0 + # via + # azure-core + # dogpile-cache + # jaraco-functools +tzdata==2023.3 + # via + # oslo-serialization + # oslo-utils uritemplate==4.1.1 # via google-api-python-client -urllib3==2.0.2 +urllib3==2.0.6 # via requests uuid==1.30 # via -r RO-SDN-arista_cloudvision/requirements.in warlock==2.0.1 # via python-glanceclient -wcwidth==0.2.6 +wcwidth==0.2.8 # via # cmd2 # prettytable @@ -488,10 +473,8 @@ wrapt==1.15.0 # python-glanceclient zc-lockfile==3.0.post1 # via cherrypy -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tox.ini b/tox.ini index 44220840..91b0b82b 100644 --- a/tox.ini +++ b/tox.ini @@ -172,7 +172,7 @@ commands = deps = {[testenv]deps} -r{toxinidir}/requirements-dev.txt -r{toxinidir}/requirements-test.txt - pylint + pylint==2.17.7 skip_install = true commands = pylint -E NG-RO/osm_ng_ro --disable=E1101 @@ -209,7 +209,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash [ @@ -217,7 +217,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