projects / osm / tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 236f52a ce3542b)
Merge remote-tracking branch 'origin/master' into paas 53/12953/1
authorMark Beierl <mark.beierl@canonical.com>
Thu, 9 Feb 2023 20:55:53 +0000 (15:55 -0500)
committerMark Beierl <mark.beierl@canonical.com>
Thu, 9 Feb 2023 20:55:53 +0000 (15:55 -0500)
Change-Id: I2190a724fafbbbd7a3e0a5a9f2657c733fa90fd9
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
1  2 
requirements-dev.in patch | diff1 | diff2 | blob | history
requirements-dev.txt patch | diff1 | diff2 | blob | history
requirements.txt patch | diff1 | diff2 | blob | history

diff --combined requirements-dev.in
index dc09a5e,dc09a5e..ee8b383
--- 1/requirements-dev.in
--- 2/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 --combined requirements-dev.txt
index 527b12c,ef3915f..5092a8e
--- 1/requirements-dev.txt
--- 2/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 --combined requirements.txt
index d2edc30,9a55288..9b3b6d8
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -22,53 -22,49 +22,49 @@@ async-generator==1.1
      # via
      #   trio
      #   trio-websocket
- attrs==21.4.0
+ attrs==22.2.0
      # via
      #   cmd2
+     #   jsonschema
      #   outcome
      #   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
- blessings==1.6
+ blessings==1.7
      # via charm-tools
- certifi==2022.6.15
+ certifi==2022.12.7
      # via
      #   requests
-     #   urllib3
- cffi==1.15.0
+     #   selenium
+ cffi==1.15.1
      # via
-     #   bcrypt
      #   cryptography
      #   pynacl
- charm-tools==2.8.3
+ charm-tools==3.0.4
      # via -r requirements.in
- charset-normalizer==2.0.12
+ charset-normalizer==3.0.1
      # via requests
  cheetah3==3.2.6.post1
      # via charm-tools
- cliff==3.10.1
+ cliff==4.1.0
      # 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
-     #   pyopenssl
      #   secretstorage
-     #   urllib3
  debtcollector==2.5.0
      # via
      #   oslo-config
@@@ -82,30 -78,33 +78,33 @@@ decorator==5.1.
      #   openstacksdk
  dict2colander==0.2
      # via charm-tools
- distlib==0.3.4
+ distlib==0.3.6
      # via virtualenv
- distro==1.7.0
-     # via lazr-restfulclient
- dogpile-cache==1.1.6
+ dogpile-cache==1.1.8
      # via openstacksdk
  enum34==1.1.10
      # via pyangbind
- filelock==3.7.1
+ exceptiongroup==1.1.0
+     # via trio
+ filelock==3.9.0
      # via virtualenv
- h11==0.13.0
+ h11==0.14.0
      # via wsproto
  haikunator==2.1.0
      # via -r requirements.in
- httplib2==0.20.4
-     # via
-     #   launchpadlib
-     #   lazr-restfulclient
- idna==3.3
+ idna==3.4
      # via
      #   requests
      #   trio
-     #   urllib3
- iso8601==1.0.2
+ importlib-metadata==6.0.0
+     # via
+     #   cliff
+     #   keyring
+ importlib-resources==5.10.2
+     # via
+     #   jsonschema
+     #   keyring
+ iso8601==1.1.0
      # via
      #   colander
      #   keystoneauth1
@@@ -113,6 -112,12 +112,12 @@@
      #   oslo-utils
      #   python-novaclient
      #   python-openstackclient
+ jaraco-classes==3.2.3
+     # via keyring
+ jeepney==0.8.0
+     # via
+     #   keyring
+     #   secretstorage
  jmespath==1.0.1
      # via openstacksdk
  jsonpatch==1.32
@@@ -125,45 -130,32 +130,30 @@@ jsonpath-rw-ext==1.2.
      # via robotframework-jsonvalidator
  jsonpointer==2.3
      # via jsonpatch
- jsonschema==2.5.1
+ jsonschema==4.17.3
      # via
      #   charm-tools
+     #   robotframework-jsonlibrary
      #   robotframework-jsonvalidator
  jujubundlelib==0.5.7
-     # via
-     #   charm-tools
-     #   theblues
- keyring==20.0.1
-     # via
-     #   charm-tools
-     #   launchpadlib
- keystoneauth1==4.6.0
+     # via charm-tools
+ keyring==23.13.1
+     # via charm-tools
+ keystoneauth1==5.1.1
      # via
      #   openstacksdk
      #   osc-lib
      #   python-cinderclient
      #   python-keystoneclient
      #   python-novaclient
- launchpadlib==1.10.16
-     # via charm-tools
- lazr-restfulclient==0.14.4
-     # via launchpadlib
- lazr-uri==1.0.6
-     # via
-     #   launchpadlib
-     #   wadllib
- libcharmstore==0.0.9
-     # via charm-tools
- lxml==4.9.0
+ lxml==4.9.2
      # 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
@@@ -184,9 -174,9 +172,9 @@@ os-service-types==1.7.
      # via
      #   keystoneauth1
      #   openstacksdk
- osc-lib==2.6.0
+ osc-lib==2.6.2
      # via python-openstackclient
- oslo-config==8.8.0
+ oslo-config==9.1.0
      # via python-keystoneclient
  oslo-i18n==5.1.0
      # via
@@@ -197,11 -187,11 +185,11 @@@
      #   python-keystoneclient
      #   python-novaclient
      #   python-openstackclient
- oslo-serialization==4.3.0
+ oslo-serialization==5.0.0
      # via
      #   python-keystoneclient
      #   python-novaclient
- oslo-utils==6.0.0
+ oslo-utils==6.1.0
      # via
      #   osc-lib
      #   oslo-serialization
@@@ -213,25 -203,24 +201,24 @@@ otherstuf==1.1.
      # via charm-tools
  outcome==1.2.0
      # via trio
- packaging==21.3
+ packaging==23.0
      # via
      #   oslo-utils
      #   python-keystoneclient
- paramiko==2.11.0
+ paramiko==3.0.0
      # via
      #   robotframework-sshlibrary
      #   scp
  parse==1.19.0
      # via stuf
- path==16.4.0
+ path==16.6.0
      # via path-py
  path-py==12.5.0
      # via charm-tools
- pathspec==0.3.4
+ pathspec==0.10.3
      # via charm-tools
- pbr==5.9.0
+ pbr==5.11.1
      # via
-     #   cliff
      #   jsonpath-rw-ext
      #   keystoneauth1
      #   openstacksdk
@@@ -244,19 -233,19 +231,19 @@@
      #   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
      #   jsonpath-ng
      #   jsonpath-rw
- prettytable==3.3.0
+ prettytable==3.6.0
      # via
      #   cliff
      #   python-cinderclient
      #   python-novaclient
- protobuf==3.20.1
-     # via macaroonbakery
  pyang==2.5.3
      # via pyangbind
  pyangbind==0.8.1
@@@ -265,40 -254,28 +252,28 @@@ pycparser==2.2
      # via cffi
  pyjsonselect==0.2.2
      # via robotframework-jsonvalidator
- pymacaroons==0.13.0
-     # via macaroonbakery
  pynacl==1.5.0
-     # via
-     #   macaroonbakery
-     #   paramiko
-     #   pymacaroons
- pyopenssl==22.0.0
-     # via urllib3
+     # via paramiko
  pyparsing==3.0.9
-     # via
-     #   cliff
-     #   httplib2
-     #   oslo-utils
-     #   packaging
+     # via oslo-utils
  pyperclip==1.8.2
      # via cmd2
- pyrfc3339==1.1
-     # via macaroonbakery
+ pyrsistent==0.19.3
+     # via jsonschema
  pysocks==1.7.1
      # via urllib3
- python-cinderclient==8.3.0
+ python-cinderclient==9.2.0
      # via python-openstackclient
- python-keystoneclient==4.5.0
+ python-keystoneclient==5.0.1
      # via python-openstackclient
- python-novaclient==18.0.0
+ python-novaclient==18.2.0
      # via python-openstackclient
- python-openstackclient==5.8.0
+ python-openstackclient==6.0.0
      # via -r requirements.in
- pytz==2022.1
+ pytz==2022.7.1
      # via
      #   oslo-serialization
      #   oslo-utils
-     #   pyrfc3339
  pyyaml==5.4.1
      # via
      #   -r requirements.in
@@@ -309,28 -286,26 +284,26 @@@
      #   oslo-config
      #   robotframework-yamllibrary
      #   yq
- regex==2022.6.2
+ regex==2022.10.31
      # via
      #   -r requirements.in
      #   pyangbind
- requests==2.28.0
+ requests==2.28.2
      # via
      #   -r requirements.in
      #   charm-tools
      #   keystoneauth1
-     #   macaroonbakery
      #   oslo-config
      #   python-cinderclient
      #   python-keystoneclient
      #   robotframework-requests
-     #   theblues
  requestsexceptions==1.4.0
      # via openstacksdk
  requirements-parser==0.5.0
      # via charm-tools
  rfc3986==2.0.0
      # via oslo-config
- robotframework==5.0.1
+ robotframework==6.0.2
      # via
      #   -r requirements.in
      #   robotframework-jsonlibrary
@@@ -338,13 -313,13 +311,13 @@@
      #   robotframework-requests
      #   robotframework-seleniumlibrary
      #   robotframework-sshlibrary
- robotframework-jsonlibrary==0.4.1
+ robotframework-jsonlibrary==0.5
      # 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,39 -327,36 +325,35 @@@ 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
  six==1.16.0
      # via
+     #   blessings
      #   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
- stevedore==3.5.0
+ stevedore==4.1.1
      # via
      #   cliff
      #   dogpile-cache
@@@ -397,21 -369,21 +366,21 @@@
      #   python-openstackclient
  stuf==0.9.16
      # via otherstuf
- theblues==0.5.2
-     # via libcharmstore
  toml==0.10.2
      # via yq
  translationstring==1.4
      # via colander
- trio==0.21.0
+ trio==0.22.0
      # via
      #   selenium
      #   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,22 -391,24 +388,24 @@@ 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
  wrapt==1.14.1
      # via debtcollector
- wsproto==1.1.0
+ wsproto==1.2.0
      # 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