diff --git a/charms/kfp-api/charmcraft.yaml b/charms/kfp-api/charmcraft.yaml index 24d0fec5..6c0f6ddd 100644 --- a/charms/kfp-api/charmcraft.yaml +++ b/charms/kfp-api/charmcraft.yaml @@ -11,3 +11,12 @@ bases: parts: charm: charm-python-packages: [setuptools, pip] # Fixes install of some packages + # add binary packages due to https://github.com/pypa/setuptools_scm/issues/918 + charm-binary-python-packages: + - anyio + - attrs + - httpcore + - httpx + - "jsonschema==4.17.3" + - "tenacity==8.2.3" + - "urllib3==2.0.5" diff --git a/charms/kfp-api/metadata.yaml b/charms/kfp-api/metadata.yaml index 1e8202d9..327181ab 100755 --- a/charms/kfp-api/metadata.yaml +++ b/charms/kfp-api/metadata.yaml @@ -9,13 +9,13 @@ website: https://charmhub.io/kfp-api source: https://github.com/canonical/kfp-operators issues: https://github.com/canonical/kfp-operators/issues containers: - ml-pipeline-api-server: + apiserver: resource: oci-image resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/api-server:2.0.0-alpha.7 + upstream-source: charmedkubeflow/api-server:2.0.0-alpha.7_20.04_1 requires: mysql: interface: mysql diff --git a/charms/kfp-api/requirements-fmt.txt b/charms/kfp-api/requirements-fmt.txt index 2faae2da..c111aec2 100644 --- a/charms/kfp-api/requirements-fmt.txt +++ b/charms/kfp-api/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-api/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-api/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-api/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-api/requirements-integration.txt b/charms/kfp-api/requirements-integration.txt index 5d5dc507..00662008 100644 --- a/charms/kfp-api/requirements-integration.txt +++ b/charms/kfp-api/requirements-integration.txt @@ -2,19 +2,17 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-api/requirements-integration.in # -anyio==3.7.0 +anyio==4.0.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpcore -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema # outcome # trio @@ -24,13 +22,13 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpcore # httpx # kubernetes @@ -41,13 +39,13 @@ cffi==1.15.1 # via # cryptography # pynacl -charmed-kubeflow-chisme==0.0.11 - # via -r ./requirements.txt -charset-normalizer==3.1.0 +charmed-kubeflow-chisme==0.2.0 + # via -r ./charms/kfp-api/requirements.txt +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -57,11 +55,11 @@ decorator==5.1.1 # ipython deepdiff==6.2.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # anyio # pytest # trio @@ -72,20 +70,20 @@ google-auth==2.17.3 # via kubernetes h11==0.14.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpcore # wsproto h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 -httpcore==0.17.2 +httpcore==0.18.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpx -httpx==0.24.1 +httpx==0.25.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # lightkube hyperframe==6.0.1 # via @@ -93,14 +91,14 @@ hyperframe==6.0.1 # selenium-wire idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # anyio # httpx # requests # trio -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest @@ -108,34 +106,34 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme # pytest-operator jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # serialized-data-interface -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-api/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==27.2.0 # via juju -lightkube==0.13.0 +lightkube==0.14.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme -lightkube-models==1.27.1.4 +lightkube-models==1.28.1.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # lightkube macaroonbakery==1.3.1 # via @@ -143,24 +141,26 @@ macaroonbakery==1.3.1 # theblues markupsafe==2.1.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jinja2 matplotlib-inline==0.1.6 # via ipython mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 + # via -r ./charms/kfp-api/requirements.txt +ops==2.6.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme # serialized-data-interface ordered-set==4.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # deepdiff outcome==1.2.0 # via trio @@ -176,11 +176,11 @@ pickleshare==0.7.5 # via ipython pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -198,7 +198,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -209,7 +209,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -217,27 +217,27 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-api/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # juju # jujubundlelib # kubernetes @@ -247,7 +247,7 @@ pyyaml==6.0.1 # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # kubernetes # macaroonbakery # requests-oauthlib @@ -259,20 +259,22 @@ rsa==4.9 # via google-auth ruamel-yaml==0.17.32 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme ruamel-yaml-clib==0.2.7 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # ruamel-yaml -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-api/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-api/requirements-integration.in serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via + # -r ./charms/kfp-api/requirements.txt + # charmed-kubeflow-chisme six==1.16.0 # via # asttokens @@ -284,7 +286,7 @@ six==1.16.0 # python-dateutil sniffio==1.3.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # anyio # httpcore # httpx @@ -293,10 +295,10 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 +tenacity==8.2.3 # via - # -r ./requirements-integration.in - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements-integration.in + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme theblues==0.5.2 # via juju @@ -306,33 +308,33 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # kubernetes # ops websockets==7.0 @@ -341,12 +343,9 @@ wsproto==1.2.0 # via # selenium-wire # trio-websocket -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # importlib-resources zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-api/requirements-lint.txt b/charms/kfp-api/requirements-lint.txt index 453d41c4..6207f88d 100644 --- a/charms/kfp-api/requirements-lint.txt +++ b/charms/kfp-api/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-api/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-api/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-api/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-api/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-api/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-api/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-api/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-api/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-api/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-api/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-api/requirements-unit.txt b/charms/kfp-api/requirements-unit.txt index 368582e6..f44bab6a 100644 --- a/charms/kfp-api/requirements-unit.txt +++ b/charms/kfp-api/requirements-unit.txt @@ -2,156 +2,158 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-api/requirements-unit.in # -anyio==3.7.0 +anyio==4.0.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpcore attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpcore # httpx # requests -charmed-kubeflow-chisme==0.0.11 - # via -r ./requirements.txt -charset-normalizer==3.1.0 +charmed-kubeflow-chisme==0.2.0 + # via -r ./charms/kfp-api/requirements.txt +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # requests -coverage==7.2.7 - # via -r ./requirements-unit.in +coverage==7.3.1 + # via -r ./charms/kfp-api/requirements-unit.in deepdiff==6.2.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # anyio # pytest h11==0.14.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpcore -httpcore==0.17.2 +httpcore==0.18.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # httpx -httpx==0.24.1 +httpx==0.25.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # lightkube idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # anyio # httpx # requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest jinja2==3.1.2 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # serialized-data-interface -lightkube==0.13.0 +lightkube==0.14.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme -lightkube-models==1.27.1.4 +lightkube-models==1.28.1.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # lightkube markupsafe==2.1.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jinja2 oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 + # via -r ./charms/kfp-api/requirements.txt +ops==2.6.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme # serialized-data-interface ordered-set==4.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # deepdiff packaging==23.1 # via pytest pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # jsonschema -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-api/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-api/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-api/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # lightkube # ops # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # serialized-data-interface ruamel-yaml==0.17.32 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme ruamel-yaml-clib==0.2.7 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # ruamel-yaml serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via + # -r ./charms/kfp-api/requirements.txt + # charmed-kubeflow-chisme sniffio==1.3.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # anyio # httpcore # httpx -tenacity==8.2.2 +tenacity==8.2.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # charmed-kubeflow-chisme tomli==2.0.1 # via pytest -urllib3==2.0.3 +urllib3==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # requests -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # ops -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-api/requirements.txt # importlib-resources diff --git a/charms/kfp-api/requirements.txt b/charms/kfp-api/requirements.txt index 1a634db2..a5d8ade9 100644 --- a/charms/kfp-api/requirements.txt +++ b/charms/kfp-api/requirements.txt @@ -2,57 +2,57 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-api/requirements.in # -anyio==3.7.0 +anyio==4.0.0 # via httpcore attrs==23.1.0 # via jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via # httpcore # httpx # requests -charmed-kubeflow-chisme==0.0.11 - # via -r ./requirements.in -charset-normalizer==3.1.0 +charmed-kubeflow-chisme==0.2.0 + # via -r ./charms/kfp-api/requirements.in +charset-normalizer==3.2.0 # via requests deepdiff==6.2.1 # via charmed-kubeflow-chisme -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via anyio h11==0.14.0 # via httpcore -httpcore==0.17.2 +httpcore==0.18.0 # via httpx -httpx==0.24.1 +httpx==0.25.0 # via lightkube idna==3.4 # via # anyio # httpx # requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via jsonschema jinja2==3.1.2 # via charmed-kubeflow-chisme jsonschema==4.17.3 # via serialized-data-interface -lightkube==0.13.0 +lightkube==0.14.0 # via - # -r ./requirements.in + # -r ./charms/kfp-api/requirements.in # charmed-kubeflow-chisme -lightkube-models==1.27.1.4 +lightkube-models==1.28.1.4 # via - # -r ./requirements.in + # -r ./charms/kfp-api/requirements.in # lightkube markupsafe==2.1.3 # via jinja2 oci-image==1.0.0 - # via -r ./requirements.in -ops==2.3.0 + # via -r ./charms/kfp-api/requirements.in +ops==2.6.0 # via - # -r ./requirements.in + # -r ./charms/kfp-api/requirements.in # charmed-kubeflow-chisme # serialized-data-interface ordered-set==4.1.0 @@ -73,19 +73,21 @@ ruamel-yaml==0.17.32 ruamel-yaml-clib==0.2.7 # via ruamel-yaml serialized-data-interface==0.7.0 - # via -r ./requirements.in + # via + # -r ./charms/kfp-api/requirements.in + # charmed-kubeflow-chisme sniffio==1.3.0 # via # anyio # httpcore # httpx -tenacity==8.2.2 +tenacity==8.2.3 # via - # -r ./requirements.in + # -r ./charms/kfp-api/requirements.in # charmed-kubeflow-chisme -urllib3==2.0.3 +urllib3==2.0.5 # via requests -websocket-client==1.6.0 +websocket-client==1.6.3 # via ops -zipp==3.15.0 +zipp==3.17.0 # via importlib-resources diff --git a/charms/kfp-api/src/charm.py b/charms/kfp-api/src/charm.py index 74270256..22d840dd 100755 --- a/charms/kfp-api/src/charm.py +++ b/charms/kfp-api/src/charm.py @@ -76,7 +76,7 @@ def __init__(self, *args): f"--sampleconfig={SAMPLE_CONFIG} " "-logtostderr=true " ) - self._container_name = "ml-pipeline-api-server" + self._container_name = "apiserver" self._database_name = "mlpipeline" self._container = self.unit.get_container(self._container_name) @@ -100,7 +100,7 @@ def __init__(self, *args): # setup events to be handled by main event handler self.framework.observe(self.on.leader_elected, self._on_event) self.framework.observe(self.on.config_changed, self._on_event) - self.framework.observe(self.on.ml_pipeline_api_server_pebble_ready, self._on_event) + self.framework.observe(self.on.apiserver_pebble_ready, self._on_event) change_events = [ self.on["object-storage"].relation_changed, self.on["kfp-viz"].relation_changed, diff --git a/charms/kfp-api/tests/unit/test_operator.py b/charms/kfp-api/tests/unit/test_operator.py index cc28ffda..9fdc67d0 100644 --- a/charms/kfp-api/tests/unit/test_operator.py +++ b/charms/kfp-api/tests/unit/test_operator.py @@ -41,7 +41,7 @@ def harness() -> Harness: harness = Harness(KfpApiOperator) # setup container networking simulation - harness.set_can_connect("ml-pipeline-api-server", True) + harness.set_can_connect("apiserver", True) return harness @@ -53,7 +53,7 @@ class TestCharm: @patch("charm.KfpApiOperator.k8s_resource_handler") def test_not_leader(self, k8s_resource_handler: MagicMock, harness: Harness): harness.begin_with_initial_hooks() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") assert harness.charm.model.unit.status == WaitingStatus("Waiting for leadership") @pytest.mark.parametrize( @@ -110,7 +110,7 @@ def test_mysql_relation( ): harness.set_leader(True) harness.begin() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") mysql_app = "mysql_app" mysql_unit = f"{mysql_app}/0" @@ -133,7 +133,7 @@ def test_mysql_relation( def test_mysql_relation_too_many_relations(self, harness: Harness): harness.set_leader(True) harness.begin() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") mysql_app = "mysql_app" mysql_unit = f"{mysql_app}/0" @@ -151,7 +151,7 @@ def test_mysql_relation_too_many_relations(self, harness: Harness): def test_kfp_viz_relation_missing(self, harness: Harness): harness.set_leader(True) harness.begin() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") # check for correct error message when retrieving missing relation data interfaces = harness.charm._get_interfaces() @@ -311,7 +311,7 @@ def test_relations_that_provide_data( ): harness.set_leader(True) harness.begin() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") other_app = "other-app" other_unit = f"{other_app}/0" @@ -393,7 +393,7 @@ def test_install_with_all_inputs_and_pebble( harness.update_relation_data(kfpapi_rel_id, "kfp-api-subscriber", kfpapi_data) harness.begin_with_initial_hooks() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") this_app_name = harness.charm.model.app.name # Test that we sent data to anyone subscribing to us @@ -413,12 +413,12 @@ def test_install_with_all_inputs_and_pebble( k8s_resource_handler.apply.assert_called() # test Pebble - assert harness.charm.container.get_service("ml-pipeline-api-server").is_running() - pebble_plan = harness.get_container_pebble_plan("ml-pipeline-api-server") + assert harness.charm.container.get_service("apiserver").is_running() + pebble_plan = harness.get_container_pebble_plan("apiserver") assert pebble_plan assert pebble_plan.services pebble_plan_info = pebble_plan.to_dict() - pebble_exec_command = pebble_plan_info["services"]["ml-pipeline-api-server"]["command"] + pebble_exec_command = pebble_plan_info["services"]["apiserver"]["command"] exec_command = ( # TODO: Remove 'sleep' as soon as a fix for # https://github.com/canonical/pebble/issues/240 is provided @@ -429,7 +429,7 @@ def test_install_with_all_inputs_and_pebble( "-logtostderr=true " ) assert pebble_exec_command == f"bash -c '{exec_command}'" - test_env = pebble_plan_info["services"]["ml-pipeline-api-server"]["environment"] + test_env = pebble_plan_info["services"]["apiserver"]["environment"] # there should be 1 environment variable assert 1 == len(test_env) assert "test_model" == test_env["POD_NAMESPACE"] @@ -450,7 +450,7 @@ def test_update_status( """Test update status handler.""" harness.set_leader(True) harness.begin_with_initial_hooks() - harness.container_pebble_ready("ml-pipeline-api-server") + harness.container_pebble_ready("apiserver") # test successful update status _apply_k8s_resources.reset_mock() diff --git a/charms/kfp-persistence/charmcraft.yaml b/charms/kfp-persistence/charmcraft.yaml index 24d0fec5..6c0f6ddd 100644 --- a/charms/kfp-persistence/charmcraft.yaml +++ b/charms/kfp-persistence/charmcraft.yaml @@ -11,3 +11,12 @@ bases: parts: charm: charm-python-packages: [setuptools, pip] # Fixes install of some packages + # add binary packages due to https://github.com/pypa/setuptools_scm/issues/918 + charm-binary-python-packages: + - anyio + - attrs + - httpcore + - httpx + - "jsonschema==4.17.3" + - "tenacity==8.2.3" + - "urllib3==2.0.5" diff --git a/charms/kfp-persistence/metadata.yaml b/charms/kfp-persistence/metadata.yaml index 51f6ab70..88c2cded 100755 --- a/charms/kfp-persistence/metadata.yaml +++ b/charms/kfp-persistence/metadata.yaml @@ -12,7 +12,7 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/persistenceagent:2.0.0-alpha.7 + upstream-source: charmedkubeflow/persistenceagent:2.0.0-alpha.7_22.04_1 requires: kfp-api: interface: k8s-service diff --git a/charms/kfp-persistence/requirements-fmt.txt b/charms/kfp-persistence/requirements-fmt.txt index 2faae2da..4fa9bb56 100644 --- a/charms/kfp-persistence/requirements-fmt.txt +++ b/charms/kfp-persistence/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-persistence/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-persistence/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-persistence/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-persistence/requirements-integration.txt b/charms/kfp-persistence/requirements-integration.txt index 4d6eee29..d257d709 100644 --- a/charms/kfp-persistence/requirements-integration.txt +++ b/charms/kfp-persistence/requirements-integration.txt @@ -2,15 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-persistence/requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema # outcome # trio @@ -20,13 +18,13 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # kubernetes # requests # selenium @@ -35,11 +33,11 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -47,7 +45,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # pytest # trio @@ -68,12 +66,12 @@ hyperframe==6.0.1 # selenium-wire idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # requests # trio -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest @@ -81,23 +79,23 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # serialized-data-interface -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-persistence/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 # via @@ -110,12 +108,14 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-persistence/requirements.txt ops==1.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # serialized-data-interface outcome==1.2.0 # via trio @@ -131,11 +131,11 @@ pickleshare==0.7.5 # via ipython pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -153,7 +153,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -164,7 +164,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -172,27 +172,27 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-persistence/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # juju # jujubundlelib # kubernetes @@ -201,7 +201,7 @@ pyyaml==6.0.1 # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # kubernetes # macaroonbakery # requests-oauthlib @@ -211,14 +211,14 @@ requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-persistence/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-persistence/requirements-integration.in serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-persistence/requirements.txt six==1.16.0 # via # asttokens @@ -234,8 +234,8 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 - # via -r ./requirements-integration.in +tenacity==8.2.3 + # via -r ./charms/kfp-persistence/requirements-integration.in theblues==0.5.2 # via juju tomli==2.0.1 @@ -244,31 +244,31 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via kubernetes websockets==7.0 # via juju @@ -276,12 +276,9 @@ wsproto==1.2.0 # via # selenium-wire # trio-websocket -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # importlib-resources zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-persistence/requirements-lint.txt b/charms/kfp-persistence/requirements-lint.txt index 453d41c4..2011f50b 100644 --- a/charms/kfp-persistence/requirements-lint.txt +++ b/charms/kfp-persistence/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-persistence/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-persistence/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-persistence/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-persistence/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-persistence/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-persistence/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-persistence/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-persistence/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-persistence/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-persistence/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-persistence/requirements-unit.txt b/charms/kfp-persistence/requirements-unit.txt index 70c5c93a..9a368cff 100644 --- a/charms/kfp-persistence/requirements-unit.txt +++ b/charms/kfp-persistence/requirements-unit.txt @@ -2,83 +2,83 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-persistence/requirements-unit.in # attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # requests -coverage==7.2.7 - # via -r ./requirements-unit.in -exceptiongroup==1.1.1 +coverage==7.3.1 + # via -r ./charms/kfp-persistence/requirements-unit.in +exceptiongroup==1.1.3 # via pytest idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-persistence/requirements.txt ops==1.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # serialized-data-interface packaging==23.1 # via pytest pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # jsonschema -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-persistence/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-persistence/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-persistence/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # ops # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-persistence/requirements.txt tomli==2.0.1 # via pytest -urllib3==2.0.3 +urllib3==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # requests -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-persistence/requirements.txt # importlib-resources diff --git a/charms/kfp-persistence/requirements.txt b/charms/kfp-persistence/requirements.txt index cdc23c0a..c8f5761b 100644 --- a/charms/kfp-persistence/requirements.txt +++ b/charms/kfp-persistence/requirements.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-persistence/requirements.in # attrs==23.1.0 # via jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests idna==3.4 # via requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via jsonschema jsonschema==4.17.3 # via serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.in + # via -r ./charms/kfp-persistence/requirements.in ops==1.2.0 # via - # -r ./requirements.in + # -r ./charms/kfp-persistence/requirements.in # serialized-data-interface pkgutil-resolve-name==1.3.10 # via jsonschema @@ -33,8 +33,8 @@ pyyaml==6.0.1 requests==2.31.0 # via serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.in -urllib3==2.0.3 + # via -r ./charms/kfp-persistence/requirements.in +urllib3==2.0.5 # via requests -zipp==3.15.0 +zipp==3.17.0 # via importlib-resources diff --git a/charms/kfp-profile-controller/charmcraft.yaml b/charms/kfp-profile-controller/charmcraft.yaml index 18bbe4dd..29400b4f 100644 --- a/charms/kfp-profile-controller/charmcraft.yaml +++ b/charms/kfp-profile-controller/charmcraft.yaml @@ -11,3 +11,12 @@ parts: prime: - ./files/upstream/sync.py charm-python-packages: [setuptools, pip] # Fixes install of some packages + # add binary packages due to https://github.com/pypa/setuptools_scm/issues/918 + charm-binary-python-packages: + - anyio + - attrs + - httpcore + - httpx + - "jsonschema==4.17.3" + - "tenacity==8.2.3" + - "urllib3==2.0.5" diff --git a/charms/kfp-profile-controller/requirements-fmt.txt b/charms/kfp-profile-controller/requirements-fmt.txt index 2faae2da..927544f6 100644 --- a/charms/kfp-profile-controller/requirements-fmt.txt +++ b/charms/kfp-profile-controller/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-profile-controller/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-profile-controller/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-profile-controller/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-profile-controller/requirements-integration.txt b/charms/kfp-profile-controller/requirements-integration.txt index 1e854be7..6b471465 100644 --- a/charms/kfp-profile-controller/requirements-integration.txt +++ b/charms/kfp-profile-controller/requirements-integration.txt @@ -2,17 +2,15 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-profile-controller/requirements-integration.in # -anyio==3.7.0 +anyio==4.0.0 # via httpcore -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema # outcome # trio @@ -22,13 +20,13 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # httpcore # httpx # kubernetes @@ -39,11 +37,11 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -51,7 +49,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # anyio # pytest @@ -69,9 +67,9 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 -httpcore==0.17.2 +httpcore==0.18.0 # via httpx -httpx==0.24.1 +httpx==0.25.0 # via lightkube hyperframe==6.0.1 # via @@ -79,14 +77,14 @@ hyperframe==6.0.1 # selenium-wire idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # anyio # httpx # requests # trio -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest @@ -94,27 +92,27 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # serialized-data-interface -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-profile-controller/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==27.2.0 # via juju -lightkube==0.13.0 - # via -r ./requirements-integration.in -lightkube-models==1.27.1.4 +lightkube==0.14.0 + # via -r ./charms/kfp-profile-controller/requirements-integration.in +lightkube-models==1.28.1.4 # via lightkube macaroonbakery==1.3.1 # via @@ -127,12 +125,14 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-profile-controller/requirements.txt ops==1.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # serialized-data-interface outcome==1.2.0 # via trio @@ -148,11 +148,11 @@ pickleshare==0.7.5 # via ipython pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -170,7 +170,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -181,7 +181,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -189,27 +189,27 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-profile-controller/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # juju # jujubundlelib # kubernetes @@ -219,7 +219,7 @@ pyyaml==6.0.1 # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # kubernetes # macaroonbakery # requests-oauthlib @@ -229,14 +229,14 @@ requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-profile-controller/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-profile-controller/requirements-integration.in serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-profile-controller/requirements.txt six==1.16.0 # via # asttokens @@ -256,8 +256,8 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 - # via -r ./requirements-integration.in +tenacity==8.2.3 + # via -r ./charms/kfp-profile-controller/requirements-integration.in theblues==0.5.2 # via juju tomli==2.0.1 @@ -266,31 +266,31 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via kubernetes websockets==7.0 # via juju @@ -298,12 +298,9 @@ wsproto==1.2.0 # via # selenium-wire # trio-websocket -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # importlib-resources zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-profile-controller/requirements-lint.txt b/charms/kfp-profile-controller/requirements-lint.txt index 453d41c4..3995bee7 100644 --- a/charms/kfp-profile-controller/requirements-lint.txt +++ b/charms/kfp-profile-controller/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-profile-controller/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-profile-controller/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-profile-controller/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-profile-controller/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-profile-controller/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-profile-controller/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-profile-controller/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-profile-controller/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-profile-controller/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-profile-controller/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-profile-controller/requirements-unit.txt b/charms/kfp-profile-controller/requirements-unit.txt index 70c5c93a..ee944be9 100644 --- a/charms/kfp-profile-controller/requirements-unit.txt +++ b/charms/kfp-profile-controller/requirements-unit.txt @@ -2,83 +2,83 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-profile-controller/requirements-unit.in # attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # requests -coverage==7.2.7 - # via -r ./requirements-unit.in -exceptiongroup==1.1.1 +coverage==7.3.1 + # via -r ./charms/kfp-profile-controller/requirements-unit.in +exceptiongroup==1.1.3 # via pytest idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-profile-controller/requirements.txt ops==1.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # serialized-data-interface packaging==23.1 # via pytest pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # jsonschema -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-profile-controller/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-profile-controller/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-profile-controller/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # ops # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-profile-controller/requirements.txt tomli==2.0.1 # via pytest -urllib3==2.0.3 +urllib3==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # requests -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-profile-controller/requirements.txt # importlib-resources diff --git a/charms/kfp-profile-controller/requirements.txt b/charms/kfp-profile-controller/requirements.txt index cdc23c0a..31c924f5 100644 --- a/charms/kfp-profile-controller/requirements.txt +++ b/charms/kfp-profile-controller/requirements.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-profile-controller/requirements.in # attrs==23.1.0 # via jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests idna==3.4 # via requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via jsonschema jsonschema==4.17.3 # via serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.in + # via -r ./charms/kfp-profile-controller/requirements.in ops==1.2.0 # via - # -r ./requirements.in + # -r ./charms/kfp-profile-controller/requirements.in # serialized-data-interface pkgutil-resolve-name==1.3.10 # via jsonschema @@ -33,8 +33,8 @@ pyyaml==6.0.1 requests==2.31.0 # via serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.in -urllib3==2.0.3 + # via -r ./charms/kfp-profile-controller/requirements.in +urllib3==2.0.5 # via requests -zipp==3.15.0 +zipp==3.17.0 # via importlib-resources diff --git a/charms/kfp-schedwf/metadata.yaml b/charms/kfp-schedwf/metadata.yaml index 550a33ce..6a548b3c 100755 --- a/charms/kfp-schedwf/metadata.yaml +++ b/charms/kfp-schedwf/metadata.yaml @@ -12,4 +12,4 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-alpha.7 + upstream-source: charmedkubeflow/scheduledworkflow:2.0.0-alpha.7_22.04_1 diff --git a/charms/kfp-schedwf/requirements-fmt.txt b/charms/kfp-schedwf/requirements-fmt.txt index 2faae2da..33e4cfc9 100644 --- a/charms/kfp-schedwf/requirements-fmt.txt +++ b/charms/kfp-schedwf/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-schedwf/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-schedwf/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-schedwf/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-schedwf/requirements-integration.txt b/charms/kfp-schedwf/requirements-integration.txt index 48533569..346b0192 100644 --- a/charms/kfp-schedwf/requirements-integration.txt +++ b/charms/kfp-schedwf/requirements-integration.txt @@ -2,12 +2,10 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-schedwf/requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via # outcome @@ -18,11 +16,11 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via # kubernetes # requests @@ -32,9 +30,9 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -42,14 +40,14 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # pytest # trio # trio-websocket executing==1.2.0 # via stack-data -google-auth==2.17.3 +google-auth==2.23.0 # via kubernetes h11==0.14.0 # via wsproto @@ -71,19 +69,19 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-schedwf/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==28.1.0 # via juju macaroonbakery==1.3.1 # via @@ -96,11 +94,13 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-schedwf/requirements.txt +ops==2.6.0 + # via -r ./charms/kfp-schedwf/requirements.txt outcome==1.2.0 # via trio packaging==23.1 @@ -113,9 +113,9 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -133,7 +133,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -144,7 +144,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -154,21 +154,21 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-schedwf/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-schedwf/requirements.txt # juju # jujubundlelib # kubernetes @@ -184,16 +184,15 @@ requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-schedwf/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-schedwf/requirements-integration.in six==1.16.0 # via # asttokens - # google-auth # kubernetes # macaroonbakery # paramiko @@ -205,8 +204,8 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 - # via -r ./requirements-integration.in +tenacity==8.2.3 + # via -r ./charms/kfp-schedwf/requirements-integration.in theblues==0.5.2 # via juju tomli==2.0.1 @@ -215,32 +214,33 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==1.26.16 # via + # google-auth # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-schedwf/requirements.txt # kubernetes # ops websockets==7.0 @@ -251,6 +251,3 @@ wsproto==1.2.0 # trio-websocket zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-schedwf/requirements-lint.txt b/charms/kfp-schedwf/requirements-lint.txt index 453d41c4..803353e3 100644 --- a/charms/kfp-schedwf/requirements-lint.txt +++ b/charms/kfp-schedwf/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-schedwf/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-schedwf/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-schedwf/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-schedwf/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-schedwf/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-schedwf/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-schedwf/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-schedwf/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-schedwf/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-schedwf/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-schedwf/requirements-unit.txt b/charms/kfp-schedwf/requirements-unit.txt index 89582631..1eb7fa11 100644 --- a/charms/kfp-schedwf/requirements-unit.txt +++ b/charms/kfp-schedwf/requirements-unit.txt @@ -2,38 +2,38 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-schedwf/requirements-unit.in # -coverage==7.2.7 - # via -r ./requirements-unit.in -exceptiongroup==1.1.1 +coverage==7.3.1 + # via -r ./charms/kfp-schedwf/requirements-unit.in +exceptiongroup==1.1.3 # via pytest iniconfig==2.0.0 # via pytest oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-schedwf/requirements.txt +ops==2.6.0 + # via -r ./charms/kfp-schedwf/requirements.txt packaging==23.1 # via pytest -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-schedwf/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-schedwf/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-schedwf/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-schedwf/requirements.txt # ops tomli==2.0.1 # via pytest -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-schedwf/requirements.txt # ops diff --git a/charms/kfp-schedwf/requirements.txt b/charms/kfp-schedwf/requirements.txt index 2f58ec4c..1fb1aa60 100644 --- a/charms/kfp-schedwf/requirements.txt +++ b/charms/kfp-schedwf/requirements.txt @@ -2,13 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-schedwf/requirements.in # oci-image==1.0.0 - # via -r ./requirements.in -ops==2.3.0 - # via -r ./requirements.in + # via -r ./charms/kfp-schedwf/requirements.in +ops==2.6.0 + # via -r ./charms/kfp-schedwf/requirements.in pyyaml==6.0.1 # via ops -websocket-client==1.6.0 +websocket-client==1.6.3 # via ops diff --git a/charms/kfp-ui/charmcraft.yaml b/charms/kfp-ui/charmcraft.yaml index 24d0fec5..6c0f6ddd 100644 --- a/charms/kfp-ui/charmcraft.yaml +++ b/charms/kfp-ui/charmcraft.yaml @@ -11,3 +11,12 @@ bases: parts: charm: charm-python-packages: [setuptools, pip] # Fixes install of some packages + # add binary packages due to https://github.com/pypa/setuptools_scm/issues/918 + charm-binary-python-packages: + - anyio + - attrs + - httpcore + - httpx + - "jsonschema==4.17.3" + - "tenacity==8.2.3" + - "urllib3==2.0.5" diff --git a/charms/kfp-ui/requirements-fmt.txt b/charms/kfp-ui/requirements-fmt.txt index 2faae2da..0133dea7 100644 --- a/charms/kfp-ui/requirements-fmt.txt +++ b/charms/kfp-ui/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-ui/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-ui/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-ui/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-ui/requirements-integration.txt b/charms/kfp-ui/requirements-integration.txt index 586c70fb..53fbcbe8 100644 --- a/charms/kfp-ui/requirements-integration.txt +++ b/charms/kfp-ui/requirements-integration.txt @@ -2,15 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-ui/requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema # outcome # trio @@ -20,13 +18,13 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # kubernetes # requests # selenium @@ -35,11 +33,11 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -47,7 +45,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # pytest # trio @@ -68,12 +66,12 @@ hyperframe==6.0.1 # selenium-wire idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # requests # trio -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest @@ -81,23 +79,23 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # serialized-data-interface -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-ui/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 # via @@ -110,12 +108,14 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 + # via -r ./charms/kfp-ui/requirements.txt +ops==2.6.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # serialized-data-interface outcome==1.2.0 # via trio @@ -131,11 +131,11 @@ pickleshare==0.7.5 # via ipython pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -153,7 +153,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -164,7 +164,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -172,27 +172,27 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-ui/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # juju # jujubundlelib # kubernetes @@ -201,7 +201,7 @@ pyyaml==6.0.1 # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # kubernetes # macaroonbakery # requests-oauthlib @@ -211,14 +211,14 @@ requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-ui/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-ui/requirements-integration.in serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-ui/requirements.txt six==1.16.0 # via # asttokens @@ -234,8 +234,8 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 - # via -r ./requirements-integration.in +tenacity==8.2.3 + # via -r ./charms/kfp-ui/requirements-integration.in theblues==0.5.2 # via juju tomli==2.0.1 @@ -244,33 +244,33 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # kubernetes # ops websockets==7.0 @@ -279,12 +279,9 @@ wsproto==1.2.0 # via # selenium-wire # trio-websocket -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # importlib-resources zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-ui/requirements-lint.txt b/charms/kfp-ui/requirements-lint.txt index 453d41c4..08341328 100644 --- a/charms/kfp-ui/requirements-lint.txt +++ b/charms/kfp-ui/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-ui/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-ui/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-ui/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-ui/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-ui/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-ui/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-ui/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-ui/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-ui/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-ui/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-ui/requirements-unit.txt b/charms/kfp-ui/requirements-unit.txt index 2473ccf8..fbf7ce68 100644 --- a/charms/kfp-ui/requirements-unit.txt +++ b/charms/kfp-ui/requirements-unit.txt @@ -2,87 +2,87 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-ui/requirements-unit.in # attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # requests -coverage==7.2.7 - # via -r ./requirements-unit.in -exceptiongroup==1.1.1 +coverage==7.3.1 + # via -r ./charms/kfp-ui/requirements-unit.in +exceptiongroup==1.1.3 # via pytest idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 + # via -r ./charms/kfp-ui/requirements.txt +ops==2.6.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # serialized-data-interface packaging==23.1 # via pytest pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # jsonschema -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-ui/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-ui/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-ui/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # ops # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-ui/requirements.txt tomli==2.0.1 # via pytest -urllib3==2.0.3 +urllib3==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # requests -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # ops -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-ui/requirements.txt # importlib-resources diff --git a/charms/kfp-ui/requirements.txt b/charms/kfp-ui/requirements.txt index 46fccac3..4de0cf50 100644 --- a/charms/kfp-ui/requirements.txt +++ b/charms/kfp-ui/requirements.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-ui/requirements.in # attrs==23.1.0 # via jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests idna==3.4 # via requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via jsonschema jsonschema==4.17.3 # via serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.in -ops==2.3.0 + # via -r ./charms/kfp-ui/requirements.in +ops==2.6.0 # via - # -r ./requirements.in + # -r ./charms/kfp-ui/requirements.in # serialized-data-interface pkgutil-resolve-name==1.3.10 # via jsonschema @@ -33,10 +33,10 @@ pyyaml==6.0.1 requests==2.31.0 # via serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.in -urllib3==2.0.3 + # via -r ./charms/kfp-ui/requirements.in +urllib3==2.0.5 # via requests -websocket-client==1.6.0 +websocket-client==1.6.3 # via ops -zipp==3.15.0 +zipp==3.17.0 # via importlib-resources diff --git a/charms/kfp-ui/src/charm.py b/charms/kfp-ui/src/charm.py index d581a3d0..c6adf0ab 100755 --- a/charms/kfp-ui/src/charm.py +++ b/charms/kfp-ui/src/charm.py @@ -155,7 +155,7 @@ def _main(self, event): }, "containers": [ { - "name": "ml-pipeline-ui", + "name": "ml-frontend", "imageDetails": image_details, "ports": [ { diff --git a/charms/kfp-viewer/metadata.yaml b/charms/kfp-viewer/metadata.yaml index b7f53e27..29bf2f2d 100755 --- a/charms/kfp-viewer/metadata.yaml +++ b/charms/kfp-viewer/metadata.yaml @@ -12,4 +12,4 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-alpha.7 + upstream-source: charmedkubeflow/viewer-crd-controller:2.0.0-alpha.7_22.04_1 diff --git a/charms/kfp-viewer/requirements-fmt.txt b/charms/kfp-viewer/requirements-fmt.txt index 2faae2da..81d3d0a6 100644 --- a/charms/kfp-viewer/requirements-fmt.txt +++ b/charms/kfp-viewer/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-viewer/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-viewer/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-viewer/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-viewer/requirements-integration.txt b/charms/kfp-viewer/requirements-integration.txt index 48533569..ea8751a3 100644 --- a/charms/kfp-viewer/requirements-integration.txt +++ b/charms/kfp-viewer/requirements-integration.txt @@ -2,12 +2,10 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-viewer/requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via # outcome @@ -18,11 +16,11 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via # kubernetes # requests @@ -32,9 +30,9 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -42,14 +40,14 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # pytest # trio # trio-websocket executing==1.2.0 # via stack-data -google-auth==2.17.3 +google-auth==2.23.0 # via kubernetes h11==0.14.0 # via wsproto @@ -71,19 +69,19 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-viewer/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==28.1.0 # via juju macaroonbakery==1.3.1 # via @@ -96,11 +94,13 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-viewer/requirements.txt +ops==2.6.0 + # via -r ./charms/kfp-viewer/requirements.txt outcome==1.2.0 # via trio packaging==23.1 @@ -113,9 +113,9 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -133,7 +133,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -144,7 +144,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -154,21 +154,21 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-viewer/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-viewer/requirements.txt # juju # jujubundlelib # kubernetes @@ -184,16 +184,15 @@ requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-viewer/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-viewer/requirements-integration.in six==1.16.0 # via # asttokens - # google-auth # kubernetes # macaroonbakery # paramiko @@ -205,8 +204,8 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 - # via -r ./requirements-integration.in +tenacity==8.2.3 + # via -r ./charms/kfp-viewer/requirements-integration.in theblues==0.5.2 # via juju tomli==2.0.1 @@ -215,32 +214,33 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==1.26.16 # via + # google-auth # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viewer/requirements.txt # kubernetes # ops websockets==7.0 @@ -251,6 +251,3 @@ wsproto==1.2.0 # trio-websocket zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-viewer/requirements-lint.txt b/charms/kfp-viewer/requirements-lint.txt index 453d41c4..5e83c41e 100644 --- a/charms/kfp-viewer/requirements-lint.txt +++ b/charms/kfp-viewer/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-viewer/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-viewer/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-viewer/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-viewer/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-viewer/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-viewer/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-viewer/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-viewer/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-viewer/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viewer/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-viewer/requirements-unit.txt b/charms/kfp-viewer/requirements-unit.txt index 89582631..fa535860 100644 --- a/charms/kfp-viewer/requirements-unit.txt +++ b/charms/kfp-viewer/requirements-unit.txt @@ -2,38 +2,38 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-viewer/requirements-unit.in # -coverage==7.2.7 - # via -r ./requirements-unit.in -exceptiongroup==1.1.1 +coverage==7.3.1 + # via -r ./charms/kfp-viewer/requirements-unit.in +exceptiongroup==1.1.3 # via pytest iniconfig==2.0.0 # via pytest oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-viewer/requirements.txt +ops==2.6.0 + # via -r ./charms/kfp-viewer/requirements.txt packaging==23.1 # via pytest -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-viewer/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-viewer/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-viewer/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-viewer/requirements.txt # ops tomli==2.0.1 # via pytest -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viewer/requirements.txt # ops diff --git a/charms/kfp-viewer/requirements.txt b/charms/kfp-viewer/requirements.txt index 2f58ec4c..84e67e85 100644 --- a/charms/kfp-viewer/requirements.txt +++ b/charms/kfp-viewer/requirements.txt @@ -2,13 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-viewer/requirements.in # oci-image==1.0.0 - # via -r ./requirements.in -ops==2.3.0 - # via -r ./requirements.in + # via -r ./charms/kfp-viewer/requirements.in +ops==2.6.0 + # via -r ./charms/kfp-viewer/requirements.in pyyaml==6.0.1 # via ops -websocket-client==1.6.0 +websocket-client==1.6.3 # via ops diff --git a/charms/kfp-viz/charmcraft.yaml b/charms/kfp-viz/charmcraft.yaml index 24d0fec5..6c0f6ddd 100644 --- a/charms/kfp-viz/charmcraft.yaml +++ b/charms/kfp-viz/charmcraft.yaml @@ -11,3 +11,12 @@ bases: parts: charm: charm-python-packages: [setuptools, pip] # Fixes install of some packages + # add binary packages due to https://github.com/pypa/setuptools_scm/issues/918 + charm-binary-python-packages: + - anyio + - attrs + - httpcore + - httpx + - "jsonschema==4.17.3" + - "tenacity==8.2.3" + - "urllib3==2.0.5" diff --git a/charms/kfp-viz/metadata.yaml b/charms/kfp-viz/metadata.yaml index 050aaa5c..f593a405 100755 --- a/charms/kfp-viz/metadata.yaml +++ b/charms/kfp-viz/metadata.yaml @@ -9,7 +9,7 @@ resources: oci-image: type: oci-image description: Backing OCI image - upstream-source: gcr.io/ml-pipeline/visualization-server:2.0.0-alpha.7 + upstream-source: charmedkubeflow/visualization-server:2.0.0-alpha.7_20.04_1 provides: kfp-viz: interface: k8s-service diff --git a/charms/kfp-viz/requirements-fmt.txt b/charms/kfp-viz/requirements-fmt.txt index 2faae2da..6728af67 100644 --- a/charms/kfp-viz/requirements-fmt.txt +++ b/charms/kfp-viz/requirements-fmt.txt @@ -2,23 +2,23 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-fmt.in +# pip-compile ./charms/kfp-viz/requirements-fmt.in # -black==23.3.0 - # via -r ./requirements-fmt.in -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-viz/requirements-fmt.in +click==8.1.7 # via black isort==5.12.0 - # via -r ./requirements-fmt.in + # via -r ./charms/kfp-viz/requirements-fmt.in mypy-extensions==1.0.0 # via black packaging==23.1 # via black -pathspec==0.11.1 +pathspec==0.11.2 # via black -platformdirs==3.7.0 +platformdirs==3.10.0 # via black tomli==2.0.1 # via black -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via black diff --git a/charms/kfp-viz/requirements-integration.txt b/charms/kfp-viz/requirements-integration.txt index 586c70fb..5e6ccb4b 100644 --- a/charms/kfp-viz/requirements-integration.txt +++ b/charms/kfp-viz/requirements-integration.txt @@ -2,15 +2,13 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-integration.in +# pip-compile ./charms/kfp-viz/requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data -async-generator==1.10 - # via trio attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema # outcome # trio @@ -20,13 +18,13 @@ bcrypt==4.0.1 # via paramiko blinker==1.6.2 # via selenium-wire -brotli==1.0.9 +brotli==1.1.0 # via selenium-wire cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # kubernetes # requests # selenium @@ -35,11 +33,11 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # requests -cryptography==41.0.1 +cryptography==41.0.4 # via # paramiko # pyopenssl @@ -47,7 +45,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via # pytest # trio @@ -68,12 +66,12 @@ hyperframe==6.0.1 # selenium-wire idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # requests # trio -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest @@ -81,23 +79,23 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # serialized-data-interface -juju==2.9.44.0 +juju==2.9.44.1 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-viz/requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues kaitaistruct==0.10 # via selenium-wire -kubernetes==26.1.0 +kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 # via @@ -110,12 +108,14 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 + # via -r ./charms/kfp-viz/requirements.txt +ops==2.6.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # serialized-data-interface outcome==1.2.0 # via trio @@ -131,11 +131,11 @@ pickleshare==0.7.5 # via ipython pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -153,7 +153,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -164,7 +164,7 @@ pynacl==1.5.0 # pymacaroons pyopenssl==23.2.0 # via selenium-wire -pyparsing==3.1.0 +pyparsing==3.1.1 # via selenium-wire pyrfc3339==1.1 # via @@ -172,27 +172,27 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.3.2 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 - # via -r ./requirements-integration.in +pytest-operator==0.29.0 + # via -r ./charms/kfp-viz/requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # juju # jujubundlelib # kubernetes @@ -201,7 +201,7 @@ pyyaml==6.0.1 # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # kubernetes # macaroonbakery # requests-oauthlib @@ -211,14 +211,14 @@ requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.10.0 +selenium==4.12.0 # via - # -r ./requirements-integration.in + # -r ./charms/kfp-viz/requirements-integration.in # selenium-wire selenium-wire==5.1.0 - # via -r ./requirements-integration.in + # via -r ./charms/kfp-viz/requirements-integration.in serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-viz/requirements.txt six==1.16.0 # via # asttokens @@ -234,8 +234,8 @@ sortedcontainers==2.4.0 # via trio stack-data==0.6.2 # via ipython -tenacity==8.2.2 - # via -r ./requirements-integration.in +tenacity==8.2.3 + # via -r ./charms/kfp-viz/requirements-integration.in theblues==0.5.2 # via juju tomli==2.0.1 @@ -244,33 +244,33 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -trio==0.22.0 +trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect typing-inspect==0.9.0 # via juju -urllib3[socks]==2.0.3 +urllib3[socks]==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # kubernetes # requests # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # kubernetes # ops websockets==7.0 @@ -279,12 +279,9 @@ wsproto==1.2.0 # via # selenium-wire # trio-websocket -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # importlib-resources zstandard==0.21.0 # via selenium-wire - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/charms/kfp-viz/requirements-lint.txt b/charms/kfp-viz/requirements-lint.txt index 453d41c4..783cdfd5 100644 --- a/charms/kfp-viz/requirements-lint.txt +++ b/charms/kfp-viz/requirements-lint.txt @@ -2,62 +2,62 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking requirements-lint.in +# pip-compile ./charms/kfp-viz/requirements-lint.in # -black==23.3.0 - # via -r requirements-fmt.txt -click==8.1.3 +black==23.9.1 + # via -r ./charms/kfp-viz/requirements-fmt.txt +click==8.1.7 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black codespell==2.2.5 - # via -r requirements-lint.in + # via -r ./charms/kfp-viz/requirements-lint.in flake8==6.0.0 # via - # -r requirements-lint.in + # -r ./charms/kfp-viz/requirements-lint.in # flake8-builtins # pep8-naming # pyproject-flake8 flake8-builtins==2.1.0 - # via -r requirements-lint.in + # via -r ./charms/kfp-viz/requirements-lint.in flake8-copyright==0.2.4 - # via -r requirements-lint.in + # via -r ./charms/kfp-viz/requirements-lint.in isort==5.12.0 - # via -r requirements-fmt.txt + # via -r ./charms/kfp-viz/requirements-fmt.txt mccabe==0.7.0 # via flake8 mypy-extensions==1.0.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black packaging==23.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black -pathspec==0.11.1 +pathspec==0.11.2 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black pep8-naming==0.13.3 - # via -r requirements-lint.in -platformdirs==3.7.0 + # via -r ./charms/kfp-viz/requirements-lint.in +platformdirs==3.10.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black pycodestyle==2.10.0 # via flake8 pyflakes==3.0.1 # via flake8 pyproject-flake8==6.0.0.post1 - # via -r requirements-lint.in + # via -r ./charms/kfp-viz/requirements-lint.in tomli==2.0.1 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black # pyproject-flake8 -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via - # -r requirements-fmt.txt + # -r ./charms/kfp-viz/requirements-fmt.txt # black # The following packages are considered to be unsafe in a requirements file: diff --git a/charms/kfp-viz/requirements-unit.txt b/charms/kfp-viz/requirements-unit.txt index 2473ccf8..93d9a18d 100644 --- a/charms/kfp-viz/requirements-unit.txt +++ b/charms/kfp-viz/requirements-unit.txt @@ -2,87 +2,87 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements-unit.in +# pip-compile ./charms/kfp-viz/requirements-unit.in # attrs==23.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # requests -coverage==7.2.7 - # via -r ./requirements-unit.in -exceptiongroup==1.1.1 +coverage==7.3.1 + # via -r ./charms/kfp-viz/requirements-unit.in +exceptiongroup==1.1.3 # via pytest idna==3.4 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema iniconfig==2.0.0 # via pytest jsonschema==4.17.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.txt -ops==2.3.0 + # via -r ./charms/kfp-viz/requirements.txt +ops==2.6.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # serialized-data-interface packaging==23.1 # via pytest pkgutil-resolve-name==1.3.10 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest pyrsistent==0.19.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # jsonschema -pytest==7.3.2 +pytest==7.4.2 # via - # -r ./requirements-unit.in + # -r ./charms/kfp-viz/requirements-unit.in # pytest-lazy-fixture # pytest-mock pytest-lazy-fixture==0.6.3 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-viz/requirements-unit.in pytest-mock==3.11.1 - # via -r ./requirements-unit.in + # via -r ./charms/kfp-viz/requirements-unit.in pyyaml==6.0.1 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # ops # serialized-data-interface requests==2.31.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.txt + # via -r ./charms/kfp-viz/requirements.txt tomli==2.0.1 # via pytest -urllib3==2.0.3 +urllib3==2.0.5 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # requests -websocket-client==1.6.0 +websocket-client==1.6.3 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # ops -zipp==3.15.0 +zipp==3.17.0 # via - # -r ./requirements.txt + # -r ./charms/kfp-viz/requirements.txt # importlib-resources diff --git a/charms/kfp-viz/requirements.txt b/charms/kfp-viz/requirements.txt index 46fccac3..efb6efe6 100644 --- a/charms/kfp-viz/requirements.txt +++ b/charms/kfp-viz/requirements.txt @@ -2,25 +2,25 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --resolver=backtracking ./requirements.in +# pip-compile ./charms/kfp-viz/requirements.in # attrs==23.1.0 # via jsonschema -certifi==2023.5.7 +certifi==2023.7.22 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests idna==3.4 # via requests -importlib-resources==5.12.0 +importlib-resources==6.1.0 # via jsonschema jsonschema==4.17.3 # via serialized-data-interface oci-image==1.0.0 - # via -r ./requirements.in -ops==2.3.0 + # via -r ./charms/kfp-viz/requirements.in +ops==2.6.0 # via - # -r ./requirements.in + # -r ./charms/kfp-viz/requirements.in # serialized-data-interface pkgutil-resolve-name==1.3.10 # via jsonschema @@ -33,10 +33,10 @@ pyyaml==6.0.1 requests==2.31.0 # via serialized-data-interface serialized-data-interface==0.7.0 - # via -r ./requirements.in -urllib3==2.0.3 + # via -r ./charms/kfp-viz/requirements.in +urllib3==2.0.5 # via requests -websocket-client==1.6.0 +websocket-client==1.6.3 # via ops -zipp==3.15.0 +zipp==3.17.0 # via importlib-resources diff --git a/requirements-integration.txt b/requirements-integration.txt index f0b7b9f8..5685f17b 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -2,9 +2,9 @@ # 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 +asttokens==2.4.0 # via stack-data backcall==0.2.0 # via ipython @@ -12,7 +12,7 @@ bcrypt==4.0.1 # via paramiko cachetools==5.3.1 # via google-auth -certifi==2023.5.7 +certifi==2023.7.22 # via # kubernetes # requests @@ -20,19 +20,19 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -cryptography==41.0.1 +cryptography==41.0.4 # via paramiko decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.1 +exceptiongroup==1.1.3 # via pytest executing==1.2.0 # via stack-data -google-auth==2.20.0 +google-auth==2.23.0 # via kubernetes idna==3.4 # via requests @@ -42,17 +42,17 @@ ipdb==0.13.13 # via pytest-operator ipython==8.12.2 # via ipdb -jedi==0.18.2 +jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.42.4 +juju==2.9.44.1 # via # -r ./requirements-integration.in # pytest-operator jujubundlelib==0.5.7 # via theblues -kubernetes==26.1.0 +kubernetes==28.1.0 # via juju macaroonbakery==1.3.1 # via @@ -65,7 +65,9 @@ matplotlib-inline==0.1.6 mypy-extensions==1.0.0 # via typing-inspect oauthlib==3.2.2 - # via requests-oauthlib + # via + # kubernetes + # requests-oauthlib packaging==23.1 # via pytest paramiko==2.12.0 @@ -76,9 +78,9 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pluggy==1.2.0 +pluggy==1.3.0 # via pytest -prompt-toolkit==3.0.38 +prompt-toolkit==3.0.39 # via ipython protobuf==3.20.3 # via macaroonbakery @@ -95,7 +97,7 @@ pyasn1-modules==0.3.0 # via google-auth pycparser==2.21 # via cffi -pygments==2.15.1 +pygments==2.16.1 # via ipython pymacaroons==0.13.0 # via macaroonbakery @@ -108,20 +110,20 @@ pyrfc3339==1.1 # via # juju # macaroonbakery -pytest==7.3.2 +pytest==7.4.2 # via # -r ./requirements-integration.in # pytest-asyncio # pytest-operator -pytest-asyncio==0.21.0 +pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.28.0 +pytest-operator==0.29.0 # via -r ./requirements-integration.in python-dateutil==2.8.2 # via kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 -pyyaml==6.0 +pyyaml==6.0.1 # via # -r ./requirements-integration.in # juju @@ -141,7 +143,6 @@ rsa==4.9 six==1.16.0 # via # asttokens - # google-auth # kubernetes # macaroonbakery # paramiko @@ -157,11 +158,11 @@ tomli==2.0.1 # pytest toposort==1.10 # via juju -traitlets==5.9.0 +traitlets==5.10.0 # via # ipython # matplotlib-inline -typing-extensions==4.6.3 +typing-extensions==4.8.0 # via # ipython # typing-inspect @@ -174,10 +175,7 @@ urllib3==1.26.16 # requests wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.0 +websocket-client==1.6.3 # via kubernetes websockets==7.0 # via juju - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/tests/integration/data/kfp_against_latest_edge.yaml b/tests/integration/data/kfp_against_latest_edge.yaml index 5adf9d36..312574a7 100644 --- a/tests/integration/data/kfp_against_latest_edge.yaml +++ b/tests/integration/data/kfp_against_latest_edge.yaml @@ -1,8 +1,9 @@ applications: argo-controller: - channel: latest/edge + channel: 3.3/stable charm: ch:argo-controller scale: 1 + trust: true istio-ingressgateway: _github_repo_name: istio-operators channel: latest/edge