From: Mark Beierl Date: Thu, 9 Feb 2023 20:55:53 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into paas X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=84feb01d10d9dd59174c20f374192899236d784d;p=osm%2Ftests.git Merge remote-tracking branch 'origin/master' into paas Change-Id: I2190a724fafbbbd7a3e0a5a9f2657c733fa90fd9 Signed-off-by: Mark Beierl --- 84feb01d10d9dd59174c20f374192899236d784d diff --cc requirements-dev.in index dc09a5e,dc09a5e..ee8b383 --- a/requirements-dev.in +++ b/requirements-dev.in @@@ -13,8 -13,8 +13,8 @@@ # See the License for the specific language governing permissions and # limitations under the License. --git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im ---r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master ++git+https://osm.etsi.org/gerrit/osm/IM.git@paas#egg=osm-im ++-r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas --git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient ---r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master ++git+https://osm.etsi.org/gerrit/osm/osmclient.git@paas#egg=osm-osmclient ++-r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas diff --cc requirements-dev.txt index 527b12c,ef3915f..5092a8e --- a/requirements-dev.txt +++ b/requirements-dev.txt @@@ -14,82 -14,78 +14,78 @@@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### - bitarray==2.5.1 + bitarray==2.6.2 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas # pyangbind - certifi==2022.6.15 + certifi==2022.12.7 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas # requests - charset-normalizer==2.0.12 + charset-normalizer==3.0.1 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas # requests click==8.1.3 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas enum34==1.1.10 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas # pyangbind - idna==3.3 + idna==3.4 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas # requests jinja2==3.1.2 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas - lxml==4.9.0 + lxml==4.9.2 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas # pyang # pyangbind - markupsafe==2.1.1 + markupsafe==2.1.2 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas # jinja2 -osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@master +osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@paas # via -r requirements-dev.in -osmclient @ git+https://osm.etsi.org/gerrit/osm/osmclient.git@master +osmclient @ git+https://osm.etsi.org/gerrit/osm/osmclient.git@paas # via -r requirements-dev.in - packaging==21.3 + packaging==23.0 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas - prettytable==3.3.0 + prettytable==3.6.0 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas pyang==2.5.3 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas # pyangbind pyangbind==0.8.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas - pycurl==7.45.1 + pycurl==7.45.2 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas - pyparsing==3.0.9 - # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas - # packaging python-magic==0.4.27 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas pyyaml==5.4.1 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas - regex==2022.6.2 + regex==2022.10.31 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas # pyangbind - requests==2.28.0 + requests==2.28.2 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas six==1.16.0 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas # pyangbind - urllib3==1.26.9 + urllib3==1.26.14 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas # requests verboselogs==1.7 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas - wcwidth==0.2.5 + wcwidth==0.2.6 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas # prettytable diff --cc requirements.txt index d2edc30,9a55288..9b3b6d8 --- a/requirements.txt +++ b/requirements.txt @@@ -29,9 -30,9 +30,9 @@@ attrs==22.2. # trio autopage==0.5.1 # via cliff - bcrypt==3.2.2 + bcrypt==4.0.1 # via paramiko - bitarray==2.5.1 -bitarray==2.6.2 ++bitarray==2.7.0 # via # -r requirements.in # pyangbind @@@ -56,13 -56,11 +56,11 @@@ cliff==4.1. # via # osc-lib # python-openstackclient - cmd2==2.4.1 + cmd2==2.4.3 # via cliff - colander==1.7.0 + colander==1.8.3 # via charm-tools - coverage==6.4.1 - # via robotframework-jsonlibrary - cryptography==37.0.2 -cryptography==39.0.0 ++cryptography==39.0.1 # via # openstacksdk # paramiko @@@ -158,12 -150,12 +150,10 @@@ lxml==4.9. # via # pyang # pyangbind - macaroonbakery==1.3.1 - # via theblues + more-itertools==9.0.0 + # via jaraco-classes msgpack==1.0.4 # via oslo-serialization --munch==2.5.0 -- # via openstacksdk netaddr==0.8.0 # via # oslo-config @@@ -172,11 -164,9 +162,9 @@@ netifaces==0.11. # via # openstacksdk # oslo-utils - oauthlib==3.2.0 - # via lazr-restfulclient objectpath==0.6.1 # via robotframework-jsonvalidator - openstacksdk==0.99.0 -openstacksdk==0.103.0 ++openstacksdk==1.0.0 # via # osc-lib # python-openstackclient @@@ -244,7 -233,9 +231,9 @@@ pbr==5.11. # python-novaclient # python-openstackclient # stevedore - platformdirs==2.5.2 + pkgutil-resolve-name==1.3.10 + # via jsonschema -platformdirs==2.6.2 ++platformdirs==3.0.0 # via virtualenv ply==3.11 # via @@@ -342,9 -317,9 +315,9 @@@ robotframework-jsonlibrary==0. # via -r requirements.in robotframework-jsonvalidator==2.0.0 # via -r requirements.in - robotframework-pythonlibcore==3.0.0 -robotframework-pythonlibcore==4.0.0 ++robotframework-pythonlibcore==4.1.0 # via robotframework-seleniumlibrary - robotframework-requests==0.9.3 + robotframework-requests==0.9.4 # via -r requirements.in robotframework-seleniumlibrary==6.0.0 # via -r requirements.in @@@ -352,17 -327,19 +325,19 @@@ robotframework-sshlibrary==3.8. # via -r requirements.in robotframework-yamllibrary==0.2.8 # via -r requirements.in - ruamel-yaml==0.15.100 + ruamel-yaml==0.17.21 # via charm-tools - scp==0.14.4 + ruamel-yaml-clib==0.2.7 + # via ruamel-yaml -scp==0.14.4 ++scp==0.14.5 # via robotframework-sshlibrary - secretstorage==2.3.1 + secretstorage==3.3.3 # via # charm-tools # keyring - selenium==4.3.0 + selenium==4.8.0 # via robotframework-seleniumlibrary - simplejson==3.17.6 -simplejson==3.18.1 ++simplejson==3.18.3 # via # osc-lib # python-cinderclient @@@ -371,16 -349,10 +347,9 @@@ six==1.16. # jsonpath-ng # jsonpath-rw # keystoneauth1 - # launchpadlib - # lazr-restfulclient - # macaroonbakery -- # munch - # paramiko # pyangbind - # pymacaroons # python-keystoneclient - # virtualenv - sniffio==1.2.0 + sniffio==1.3.0 # via trio sortedcontainers==2.4.0 # via trio @@@ -409,9 -379,11 +376,11 @@@ trio==0.22. # trio-websocket trio-websocket==0.9.2 # via selenium - types-setuptools==57.4.17 -types-docutils==0.19.1.2 ++types-docutils==0.19.1.3 + # via types-setuptools -types-setuptools==65.7.0.3 ++types-setuptools==67.2.0.1 # via requirements-parser - urllib3[secure,socks]==1.26.9 + urllib3[socks]==1.26.14 # via # requests # selenium @@@ -419,11 -391,9 +388,9 @@@ verboselogs==1. # via -r requirements.in vergit==1.0.2 # via charm-tools - virtualenv==20.14.1 -virtualenv==20.17.1 ++virtualenv==20.19.0 # via charm-tools - wadllib==1.3.6 - # via lazr-restfulclient - wcwidth==0.2.5 + wcwidth==0.2.6 # via # cmd2 # prettytable @@@ -433,8 -403,12 +400,12 @@@ wsproto==1.2. # via trio-websocket xmltodict==0.13.0 # via yq - yq==2.14.0 + yq==3.1.0 # via -r requirements.in -zipp==3.12.0 ++zipp==3.13.0 + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip