Merge remote-tracking branch 'origin/master' into paas

Change-Id: I2190a724fafbbbd7a3e0a5a9f2657c733fa90fd9
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

diff --git a/requirements-dev.in b/requirements-dev.in
index dc09a5e..ee8b383 100644 (file)
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -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 --git a/requirements-dev.txt b/requirements-dev.txt
index ef3915f..5092a8e 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -16,76 +16,76 @@
 #######################################################################################
 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.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==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.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.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.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==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.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.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
 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.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.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.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.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 --git a/requirements.txt b/requirements.txt
index 9a55288..9b3b6d8 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,7 @@ autopage==0.5.1
     # via cliff
 bcrypt==4.0.1
     # via paramiko
-bitarray==2.6.2
+bitarray==2.7.0
     # via
     #   -r requirements.in
     #   pyangbind
@@ -60,7 +60,7 @@ cmd2==2.4.3
     # via cliff
 colander==1.8.3
     # via charm-tools
-cryptography==39.0.0
+cryptography==39.0.1
     # via
     #   openstacksdk
     #   paramiko
@@ -154,8 +154,6 @@ 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
@@ -166,7 +164,7 @@ netifaces==0.11.0
     #   oslo-utils
 objectpath==0.6.1
     # via robotframework-jsonvalidator
-openstacksdk==0.103.0
+openstacksdk==1.0.0
     # via
     #   osc-lib
     #   python-openstackclient
@@ -235,7 +233,7 @@ pbr==5.11.1
     #   stevedore
 pkgutil-resolve-name==1.3.10
     # via jsonschema
-platformdirs==2.6.2
+platformdirs==3.0.0
     # via virtualenv
 ply==3.11
     # via
@@ -317,7 +315,7 @@ robotframework-jsonlibrary==0.5
     # via -r requirements.in
 robotframework-jsonvalidator==2.0.0
     # via -r requirements.in
-robotframework-pythonlibcore==4.0.0
+robotframework-pythonlibcore==4.1.0
     # via robotframework-seleniumlibrary
 robotframework-requests==0.9.4
     # via -r requirements.in
@@ -331,7 +329,7 @@ ruamel-yaml==0.17.21
     # via charm-tools
 ruamel-yaml-clib==0.2.7
     # via ruamel-yaml
-scp==0.14.4
+scp==0.14.5
     # via robotframework-sshlibrary
 secretstorage==3.3.3
     # via
@@ -339,7 +337,7 @@ secretstorage==3.3.3
     #   keyring
 selenium==4.8.0
     # via robotframework-seleniumlibrary
-simplejson==3.18.1
+simplejson==3.18.3
     # via
     #   osc-lib
     #   python-cinderclient
@@ -349,7 +347,6 @@ six==1.16.0
     #   jsonpath-ng
     #   jsonpath-rw
     #   keystoneauth1
-    #   munch
     #   pyangbind
     #   python-keystoneclient
 sniffio==1.3.0
@@ -379,9 +376,9 @@ trio==0.22.0
     #   trio-websocket
 trio-websocket==0.9.2
     # via selenium
-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[socks]==1.26.14
     # via
@@ -391,7 +388,7 @@ verboselogs==1.7
     # via -r requirements.in
 vergit==1.0.2
     # via charm-tools
-virtualenv==20.17.1
+virtualenv==20.19.0
     # via charm-tools
 wcwidth==0.2.6
     # via
@@ -405,7 +402,7 @@ xmltodict==0.13.0
     # via yq
 yq==3.1.0
     # via -r requirements.in
-zipp==3.12.0
+zipp==3.13.0
     # via
     #   importlib-metadata
     #   importlib-resources