From 049d27391d1b33aef2666464a053d9626b475b27 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Mon, 7 Aug 2023 16:53:58 +0200 Subject: [PATCH] build: bump juju 2.9.44.0, sdi->0.7.0, pyyaml->6.0.1 (#139) Part of canonical/bundle-kubeflow#648 --- requirements-integration.in | 3 ++- requirements-integration.txt | 24 +++++++++++++++++------- requirements-unit.txt | 27 ++++++++++++++++----------- requirements.txt | 19 ++++++++++--------- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/requirements-integration.in b/requirements-integration.in index 00884f6..d71a7c5 100644 --- a/requirements-integration.in +++ b/requirements-integration.in @@ -1,4 +1,5 @@ -juju<3.1 +# Pinning to <3.0 due to compatibility with the 2.9 controller version and 3.0 not being maintained anymore +juju<3.0 pytest-operator selenium selenium-wire diff --git a/requirements-integration.txt b/requirements-integration.txt index babdef8..abddc75 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-integration.in +# pip-compile requirements-integration.in # asttokens==2.2.1 # via stack-data @@ -73,6 +73,10 @@ idna==2.10 # -r requirements.txt # requests # trio +importlib-resources==6.0.0 + # via + # -r requirements.txt + # jsonschema iniconfig==1.1.1 # via pytest ipdb==0.13.11 @@ -83,11 +87,11 @@ jedi==0.18.2 # via ipython jinja2==3.1.2 # via pytest-operator -jsonschema==3.2.0 +jsonschema==4.17.3 # via # -r requirements.txt # serialized-data-interface -juju==3.0.4 +juju==2.9.44.0 # via # -r requirements-integration.in # pytest-operator @@ -127,6 +131,10 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython +pkgutil-resolve-name==1.3.10 + # via + # -r requirements.txt + # jsonschema pluggy==1.0.0 # via pytest prompt-toolkit==3.0.36 @@ -184,7 +192,7 @@ python-dateutil==2.8.2 # via kubernetes pytz==2022.6 # via pyrfc3339 -pyyaml==5.4 +pyyaml==6.0.1 # via # -r requirements.txt # juju @@ -211,14 +219,12 @@ selenium==4.7.2 # selenium-wire selenium-wire==5.1.0 # via -r requirements-integration.in -serialized-data-interface==0.4.0 +serialized-data-interface==0.7.0 # via -r requirements.txt six==1.16.0 # via - # -r requirements.txt # asttokens # google-auth - # jsonschema # kubernetes # macaroonbakery # paramiko @@ -270,6 +276,10 @@ wsproto==1.2.0 # via # selenium-wire # trio-websocket +zipp==3.16.2 + # via + # -r requirements.txt + # importlib-resources zstandard==0.19.0 # via selenium-wire diff --git a/requirements-unit.txt b/requirements-unit.txt index 2a65e0a..a28e18f 100644 --- a/requirements-unit.txt +++ b/requirements-unit.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-unit.in +# pip-compile requirements-unit.in # attrs==22.1.0 # via @@ -25,9 +25,13 @@ idna==2.10 # via # -r requirements.txt # requests +importlib-resources==6.0.0 + # via + # -r requirements.txt + # jsonschema iniconfig==1.1.1 # via pytest -jsonschema==3.2.0 +jsonschema==4.17.3 # via # -r requirements.txt # serialized-data-interface @@ -39,6 +43,10 @@ ops==1.5.4 # serialized-data-interface packaging==22.0 # via pytest +pkgutil-resolve-name==1.3.10 + # via + # -r requirements.txt + # jsonschema pluggy==1.0.0 # via pytest pyrsistent==0.19.2 @@ -54,7 +62,7 @@ pytest-lazy-fixture==0.6.3 # via -r requirements-unit.in pytest-mock==3.10.0 # via -r requirements-unit.in -pyyaml==5.4 +pyyaml==6.0.1 # via # -r requirements.txt # ops @@ -63,18 +71,15 @@ requests==2.25.0 # via # -r requirements.txt # serialized-data-interface -serialized-data-interface==0.4.0 +serialized-data-interface==0.7.0 # via -r requirements.txt -six==1.16.0 - # via - # -r requirements.txt - # jsonschema tomli==2.0.1 # via pytest urllib3==1.26.13 # via # -r requirements.txt # requests - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +zipp==3.16.2 + # via + # -r requirements.txt + # importlib-resources diff --git a/requirements.txt b/requirements.txt index 5ba8212..e08102c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements.in +# pip-compile requirements.in # attrs==22.1.0 # via jsonschema @@ -12,7 +12,9 @@ chardet==3.0.4 # via requests idna==2.10 # via requests -jsonschema==3.2.0 +importlib-resources==6.0.0 + # via jsonschema +jsonschema==4.17.3 # via serialized-data-interface oci-image==1.0.0 # via -r requirements.in @@ -20,20 +22,19 @@ ops==1.5.4 # via # -r requirements.in # serialized-data-interface +pkgutil-resolve-name==1.3.10 + # via jsonschema pyrsistent==0.19.2 # via jsonschema -pyyaml==5.4 +pyyaml==6.0.1 # via # ops # serialized-data-interface requests==2.25.0 # via serialized-data-interface -serialized-data-interface==0.4.0 +serialized-data-interface==0.7.0 # via -r requirements.in -six==1.16.0 - # via jsonschema urllib3==1.26.13 # via requests - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +zipp==3.16.2 + # via importlib-resources