PyYAML fix
Change-Id: Ibf1aa08ad3e13fa9414fd52126095e1f7a5805d7
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
diff --git a/requirements-dev.in b/requirements-dev.in
index a1c82ff..dd3219b 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -14,4 +14,3 @@
# limitations under the License.
git+https://osm.etsi.org/gerrit/osm/osmclient.git@paas#egg=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 4d6c19f..56089e8 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -14,47 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#######################################################################################
-certifi==2023.5.7
- # via
- # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
- # requests
-charset-normalizer==3.1.0
- # via
- # -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=paas
-idna==3.4
- # via
- # -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=paas
-markupsafe==2.1.2
- # via
- # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
- # jinja2
osmclient @ git+https://osm.etsi.org/gerrit/osm/osmclient.git@paas
# via -r requirements-dev.in
-packaging==23.1
- # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
-prettytable==3.7.0
- # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.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=paas
-python-magic==0.4.27
- # 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/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
-requests==2.30.0
- # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
-urllib3==2.0.2
- # via
- # -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=paas
-wcwidth==0.2.6
- # via
- # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
- # prettytable
diff --git a/requirements.in b/requirements.in
index 309240d..4aae55c 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,12 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
-bitarray==2.6.2 # From IM and osmclient
-charm-tools
+bitarray
haikunator
pyangbind
python-openstackclient
-pyyaml<6
regex
requests
robotframework
@@ -30,3 +28,6 @@
robotframework-yamllibrary
verboselogs
yq
+
+-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
diff --git a/requirements.txt b/requirements.txt
index 4dba31e..b5678dd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,15 +16,14 @@
#######################################################################################
appdirs==1.4.4
# via openstacksdk
-argcomplete==3.0.8
+argcomplete==3.1.1
# via yq
-async-generator==1.10
- # via trio
attrs==23.1.0
# via
# cmd2
# jsonschema
# outcome
+ # referencing
# trio
autopage==0.5.1
# via cliff
@@ -32,37 +31,34 @@
# via paramiko
bitarray==2.7.3
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
# -r requirements.in
# pyangbind
-blessings==1.7
- # via charm-tools
certifi==2023.5.7
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# requests
# selenium
cffi==1.15.1
# via
# cryptography
# pynacl
-charm-tools==3.0.6
- # via -r requirements.in
charset-normalizer==3.1.0
- # via requests
-cheetah3==3.2.6.post1
- # via charm-tools
+ # via
+ # -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=paas
cliff==4.3.0
# via
# osc-lib
# python-openstackclient
cmd2==2.4.3
# via cliff
-colander==1.8.3
- # via charm-tools
-cryptography==40.0.2
+cryptography==41.0.2
# via
# openstacksdk
# paramiko
- # secretstorage
debtcollector==2.5.0
# via
# oslo-config
@@ -74,49 +70,39 @@
# jsonpath-ng
# jsonpath-rw
# openstacksdk
-dict2colander==0.2
- # via charm-tools
-distlib==0.3.6
- # via virtualenv
-dogpile-cache==1.2.0
+dogpile-cache==1.2.2
# via openstacksdk
enum34==1.1.10
- # via pyangbind
-exceptiongroup==1.1.1
+ # via
+ # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
+ # pyangbind
+exceptiongroup==1.1.2
# via
# trio
# trio-websocket
-filelock==3.12.0
- # via virtualenv
h11==0.14.0
# via wsproto
haikunator==2.1.0
# via -r requirements.in
idna==3.4
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# requests
# trio
-importlib-metadata==6.6.0
+importlib-metadata==6.8.0
+ # via cliff
+iso8601==2.0.0
# via
- # cliff
- # keyring
-iso8601==1.1.0
- # via
- # colander
# keystoneauth1
# openstacksdk
# oslo-utils
# python-novaclient
# python-openstackclient
-jaraco-classes==3.2.3
- # via keyring
-jeepney==0.8.0
- # via
- # keyring
- # secretstorage
+jinja2==3.1.2
+ # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
jmespath==1.0.1
# via openstacksdk
-jsonpatch==1.32
+jsonpatch==1.33
# via openstacksdk
jsonpath-ng==1.5.3
# via robotframework-jsonlibrary
@@ -124,18 +110,15 @@
# via jsonpath-rw-ext
jsonpath-rw-ext==1.2.2
# via robotframework-jsonvalidator
-jsonpointer==2.3
+jsonpointer==2.4
# via jsonpatch
-jsonschema==4.17.3
+jsonschema==4.18.4
# via
- # charm-tools
# robotframework-jsonlibrary
# robotframework-jsonvalidator
-jujubundlelib==0.5.7
- # via charm-tools
-keyring==23.13.1
- # via charm-tools
-keystoneauth1==5.1.2
+jsonschema-specifications==2023.7.1
+ # via jsonschema
+keystoneauth1==5.2.1
# via
# openstacksdk
# osc-lib
@@ -144,10 +127,13 @@
# python-novaclient
lxml==4.9.2
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
# pyang
# pyangbind
-more-itertools==9.1.0
- # via jaraco-classes
+markupsafe==2.1.2
+ # via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
+ # jinja2
msgpack==1.0.5
# via oslo-serialization
netaddr==0.8.0
@@ -160,7 +146,7 @@
# oslo-utils
objectpath==0.6.1
# via robotframework-jsonvalidator
-openstacksdk==1.1.0
+openstacksdk==1.3.1
# via
# osc-lib
# python-openstackclient
@@ -185,7 +171,7 @@
# via
# python-keystoneclient
# python-novaclient
-oslo-utils==6.1.0
+oslo-utils==6.2.0
# via
# osc-lib
# oslo-serialization
@@ -193,26 +179,17 @@
# python-keystoneclient
# python-novaclient
# python-openstackclient
-otherstuf==1.1.0
- # via charm-tools
outcome==1.2.0
# via trio
packaging==23.1
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# oslo-utils
# python-keystoneclient
-paramiko==3.1.0
+paramiko==3.2.0
# via
# robotframework-sshlibrary
# scp
-parse==1.19.0
- # via stuf
-path==16.6.0
- # via path-py
-path-py==12.5.0
- # via charm-tools
-pathspec==0.10.3
- # via charm-tools
pbr==5.11.1
# via
# jsonpath-rw-ext
@@ -227,39 +204,44 @@
# python-novaclient
# python-openstackclient
# stevedore
-platformdirs==3.5.0
- # via virtualenv
ply==3.11
# via
# jsonpath-ng
# jsonpath-rw
prettytable==3.7.0
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# cliff
# python-cinderclient
# python-novaclient
pyang==2.5.3
- # via pyangbind
+ # via
+ # -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 requirements.in
+ # via
+ # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
+ # -r requirements.in
pycparser==2.21
# via cffi
+pycurl==7.45.2
+ # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
pyjsonselect==0.2.2
# via robotframework-jsonvalidator
pynacl==1.5.0
# via paramiko
-pyparsing==3.0.9
+pyparsing==3.1.0
# via oslo-utils
pyperclip==1.8.2
# via cmd2
-pyrsistent==0.19.3
- # via jsonschema
pysocks==1.7.1
# via urllib3
python-cinderclient==9.3.0
# via python-openstackclient
python-keystoneclient==5.1.0
# via python-openstackclient
+python-magic==0.4.27
+ # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
python-novaclient==18.3.0
# via python-openstackclient
python-openstackclient==6.2.0
@@ -268,24 +250,28 @@
# via
# oslo-serialization
# oslo-utils
-pyyaml==5.4.1
+pyyaml==6.0.1
# via
- # -r requirements.in
- # charm-tools
+ # -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
# cliff
- # jujubundlelib
# openstacksdk
# oslo-config
# robotframework-yamllibrary
# yq
+referencing==0.30.0
+ # via
+ # jsonschema
+ # jsonschema-specifications
regex==2023.5.5
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
# -r requirements.in
# pyangbind
requests==2.30.0
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# -r requirements.in
- # charm-tools
# keystoneauth1
# oslo-config
# python-cinderclient
@@ -293,11 +279,9 @@
# robotframework-requests
requestsexceptions==1.4.0
# via openstacksdk
-requirements-parser==0.5.0
- # via charm-tools
rfc3986==2.0.0
# via oslo-config
-robotframework==6.0.2
+robotframework==6.1
# via
# -r requirements.in
# robotframework-jsonlibrary
@@ -309,9 +293,9 @@
# via -r requirements.in
robotframework-jsonvalidator==2.0.0
# via -r requirements.in
-robotframework-pythonlibcore==4.1.2
+robotframework-pythonlibcore==4.2.0
# via robotframework-seleniumlibrary
-robotframework-requests==0.9.4
+robotframework-requests==0.9.5
# via -r requirements.in
robotframework-seleniumlibrary==6.1.0
# via -r requirements.in
@@ -319,33 +303,28 @@
# via -r requirements.in
robotframework-yamllibrary==0.2.8
# via -r requirements.in
-ruamel-yaml==0.17.26
- # via charm-tools
-ruamel-yaml-clib==0.2.7
- # via ruamel-yaml
+rpds-py==0.9.2
+ # via
+ # jsonschema
+ # referencing
scp==0.14.5
# via robotframework-sshlibrary
-secretstorage==3.3.3
- # via
- # charm-tools
- # keyring
-selenium==4.9.1
+selenium==4.10.0
# via robotframework-seleniumlibrary
simplejson==3.19.1
# via osc-lib
six==1.16.0
# via
- # blessings
+ # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=paas
# jsonpath-ng
# jsonpath-rw
- # keystoneauth1
# pyangbind
# python-keystoneclient
sniffio==1.3.0
# via trio
sortedcontainers==2.4.0
# via trio
-stevedore==5.0.0
+stevedore==5.1.0
# via
# cliff
# dogpile-cache
@@ -356,34 +335,30 @@
# python-keystoneclient
# python-novaclient
# python-openstackclient
-stuf==0.9.16
- # via otherstuf
tomlkit==0.11.8
# via yq
-translationstring==1.4
- # via colander
-trio==0.22.0
+trio==0.22.2
# via
# selenium
# trio-websocket
-trio-websocket==0.10.2
+trio-websocket==0.10.3
# via selenium
-types-docutils==0.19.1.3
- # via types-setuptools
-types-setuptools==67.7.0.2
- # via requirements-parser
+typing-extensions==4.7.1
+ # via dogpile-cache
+tzdata==2023.3
+ # via oslo-utils
urllib3[socks]==2.0.2
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# requests
# selenium
verboselogs==1.7
- # via -r requirements.in
-vergit==1.0.2
- # via charm-tools
-virtualenv==20.23.0
- # via charm-tools
+ # via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
+ # -r requirements.in
wcwidth==0.2.6
# via
+ # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=paas
# cmd2
# prettytable
wrapt==1.15.0
@@ -394,11 +369,5 @@
# via yq
yq==3.2.2
# via -r requirements.in
-zipp==3.15.0
- # via
- # importlib-metadata
- # importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools
+zipp==3.16.2
+ # via importlib-metadata