diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 982cadc4..84f7a39f 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -92,12 +92,12 @@ jobs: uses: charmed-kubernetes/actions-operator@main with: provider: microk8s - channel: 1.24/stable - juju-channel: 2.9/stable + channel: 1.25-strict/stable + juju-channel: 3.1/stable charmcraft-channel: latest/candidate - run: | - sg microk8s -c "tox -e ${{ matrix.charm }}-integration" + sg snap_microk8s -c "tox -e ${{ matrix.charm }}-integration" - name: Collect charm debug artifacts uses: canonical/kubeflow-ci/actions/dump-charm-debug-artifacts@main @@ -130,16 +130,11 @@ jobs: uses: charmed-kubernetes/actions-operator@main with: provider: microk8s - channel: 1.24/stable - juju-channel: 2.9/stable + channel: 1.25-strict/stable + juju-channel: 3.1/stable charmcraft-channel: latest/candidate microk8s-addons: "dns hostpath-storage rbac metallb:10.64.140.43-10.64.140.49" - # TODO: Remove once https://bugs.launchpad.net/juju/+bug/2024897 is fixed - - name: Refresh Juju snap - run: | - sudo snap refresh juju --revision 22345 - - name: Run test run: | # Requires the model to be called kubeflow due to kfp-viewer @@ -147,7 +142,7 @@ jobs: # Run integration tests against the 1.7 generic install bundle definition # Using destructive mode because of https://github.com/canonical/charmcraft/issues/1132 # and https://github.com/canonical/charmcraft/issues/1138 - tox -e bundle-integration -- --model kubeflow --bundle=./tests/integration/bundles/kfp_1.7_stable_install.yaml.j2 --destructive-mode + sg snap_microk8s -c "tox -e bundle-integration -- --model kubeflow --bundle=./tests/integration/bundles/kfp_1.7_stable_install.yaml.j2 --destructive-mode" - name: Get all run: kubectl get all -A diff --git a/charms/kfp-api/requirements-integration.in b/charms/kfp-api/requirements-integration.in index e6f021b9..512c9a8c 100644 --- a/charms/kfp-api/requirements-integration.in +++ b/charms/kfp-api/requirements-integration.in @@ -1,6 +1,5 @@ -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator selenium selenium-wire diff --git a/charms/kfp-api/requirements-integration.txt b/charms/kfp-api/requirements-integration.txt index 1ec80d2c..eafe65a2 100644 --- a/charms/kfp-api/requirements-integration.txt +++ b/charms/kfp-api/requirements-integration.txt @@ -4,7 +4,7 @@ # # pip-compile requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -16,7 +16,7 @@ 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 @@ -40,7 +40,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # pytest # trio @@ -55,6 +55,8 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -73,20 +75,16 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -109,7 +107,7 @@ 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.39 # via ipython @@ -131,6 +129,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -150,35 +150,34 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -199,10 +198,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -217,7 +214,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -232,9 +229,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/charms/kfp-persistence/requirements-integration.in b/charms/kfp-persistence/requirements-integration.in index e6f021b9..512c9a8c 100644 --- a/charms/kfp-persistence/requirements-integration.in +++ b/charms/kfp-persistence/requirements-integration.in @@ -1,6 +1,5 @@ -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator selenium selenium-wire diff --git a/charms/kfp-persistence/requirements-integration.txt b/charms/kfp-persistence/requirements-integration.txt index 1ec80d2c..eafe65a2 100644 --- a/charms/kfp-persistence/requirements-integration.txt +++ b/charms/kfp-persistence/requirements-integration.txt @@ -4,7 +4,7 @@ # # pip-compile requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -16,7 +16,7 @@ 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 @@ -40,7 +40,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # pytest # trio @@ -55,6 +55,8 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -73,20 +75,16 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -109,7 +107,7 @@ 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.39 # via ipython @@ -131,6 +129,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -150,35 +150,34 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -199,10 +198,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -217,7 +214,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -232,9 +229,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/charms/kfp-profile-controller/requirements-integration.in b/charms/kfp-profile-controller/requirements-integration.in index 9420320b..fc264a74 100644 --- a/charms/kfp-profile-controller/requirements-integration.in +++ b/charms/kfp-profile-controller/requirements-integration.in @@ -1,6 +1,5 @@ -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 lightkube pytest-operator selenium diff --git a/charms/kfp-profile-controller/requirements-integration.txt b/charms/kfp-profile-controller/requirements-integration.txt index 060724e8..41bdb36a 100644 --- a/charms/kfp-profile-controller/requirements-integration.txt +++ b/charms/kfp-profile-controller/requirements-integration.txt @@ -4,9 +4,9 @@ # # pip-compile requirements-integration.in # -anyio==3.7.1 +anyio==4.0.0 # via httpcore -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -18,7 +18,7 @@ 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 @@ -44,7 +44,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # anyio # pytest @@ -66,6 +66,8 @@ httpcore==0.17.3 # via httpx httpx==0.24.1 # via lightkube +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -86,24 +88,20 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju lightkube==0.14.0 # via -r requirements-integration.in -lightkube-models==1.27.1.4 +lightkube-models==1.28.1.4 # via lightkube macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -126,7 +124,7 @@ 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.39 # via ipython @@ -148,6 +146,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -167,36 +167,35 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # lightkube # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -221,10 +220,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -239,7 +236,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -254,9 +251,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/charms/kfp-schedwf/requirements-integration.in b/charms/kfp-schedwf/requirements-integration.in index e23af3c2..4db29384 100644 --- a/charms/kfp-schedwf/requirements-integration.in +++ b/charms/kfp-schedwf/requirements-integration.in @@ -1,8 +1,7 @@ # Copyright 2023 Canonical Ltd. # See LICENSE file for licensing details. -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator selenium selenium-wire diff --git a/charms/kfp-schedwf/requirements-integration.txt b/charms/kfp-schedwf/requirements-integration.txt index 1ec80d2c..eafe65a2 100644 --- a/charms/kfp-schedwf/requirements-integration.txt +++ b/charms/kfp-schedwf/requirements-integration.txt @@ -4,7 +4,7 @@ # # pip-compile requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -16,7 +16,7 @@ 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 @@ -40,7 +40,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # pytest # trio @@ -55,6 +55,8 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -73,20 +75,16 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -109,7 +107,7 @@ 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.39 # via ipython @@ -131,6 +129,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -150,35 +150,34 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -199,10 +198,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -217,7 +214,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -232,9 +229,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/charms/kfp-ui/requirements-integration.in b/charms/kfp-ui/requirements-integration.in index e6f021b9..512c9a8c 100644 --- a/charms/kfp-ui/requirements-integration.in +++ b/charms/kfp-ui/requirements-integration.in @@ -1,6 +1,5 @@ -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator selenium selenium-wire diff --git a/charms/kfp-ui/requirements-integration.txt b/charms/kfp-ui/requirements-integration.txt index 1ec80d2c..eafe65a2 100644 --- a/charms/kfp-ui/requirements-integration.txt +++ b/charms/kfp-ui/requirements-integration.txt @@ -4,7 +4,7 @@ # # pip-compile requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -16,7 +16,7 @@ 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 @@ -40,7 +40,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # pytest # trio @@ -55,6 +55,8 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -73,20 +75,16 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -109,7 +107,7 @@ 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.39 # via ipython @@ -131,6 +129,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -150,35 +150,34 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -199,10 +198,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -217,7 +214,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -232,9 +229,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/charms/kfp-viewer/requirements-integration.in b/charms/kfp-viewer/requirements-integration.in index e6f021b9..512c9a8c 100644 --- a/charms/kfp-viewer/requirements-integration.in +++ b/charms/kfp-viewer/requirements-integration.in @@ -1,6 +1,5 @@ -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator selenium selenium-wire diff --git a/charms/kfp-viewer/requirements-integration.txt b/charms/kfp-viewer/requirements-integration.txt index 1ec80d2c..eafe65a2 100644 --- a/charms/kfp-viewer/requirements-integration.txt +++ b/charms/kfp-viewer/requirements-integration.txt @@ -4,7 +4,7 @@ # # pip-compile requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -16,7 +16,7 @@ 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 @@ -40,7 +40,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # pytest # trio @@ -55,6 +55,8 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -73,20 +75,16 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -109,7 +107,7 @@ 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.39 # via ipython @@ -131,6 +129,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -150,35 +150,34 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -199,10 +198,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -217,7 +214,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -232,9 +229,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/charms/kfp-viz/requirements-integration.in b/charms/kfp-viz/requirements-integration.in index e6f021b9..512c9a8c 100644 --- a/charms/kfp-viz/requirements-integration.in +++ b/charms/kfp-viz/requirements-integration.in @@ -1,6 +1,5 @@ -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 pytest-operator selenium selenium-wire diff --git a/charms/kfp-viz/requirements-integration.txt b/charms/kfp-viz/requirements-integration.txt index 1ec80d2c..eafe65a2 100644 --- a/charms/kfp-viz/requirements-integration.txt +++ b/charms/kfp-viz/requirements-integration.txt @@ -4,7 +4,7 @@ # # pip-compile requirements-integration.in # -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data attrs==23.1.0 # via @@ -16,7 +16,7 @@ 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 @@ -40,7 +40,7 @@ decorator==5.1.1 # via # ipdb # ipython -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # pytest # trio @@ -55,6 +55,8 @@ h2==4.1.0 # via selenium-wire hpack==4.0.0 # via h2 +hvac==1.2.0 + # via juju hyperframe==6.0.1 # via # h2 @@ -73,20 +75,16 @@ jedi==0.19.0 # via ipython jinja2==3.1.2 # via pytest-operator -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kaitaistruct==0.10 # via selenium-wire kubernetes==27.2.0 # via juju macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -109,7 +107,7 @@ 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.39 # via ipython @@ -131,6 +129,8 @@ pycparser==2.21 # via cffi pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -150,35 +150,34 @@ pysocks==1.7.1 # via # selenium-wire # urllib3 -pytest==7.4.0 +pytest==7.4.2 # via # pytest-asyncio # pytest-operator 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.1 # via # juju - # jujubundlelib # kubernetes # pytest-operator requests==2.31.0 # via + # hvac # kubernetes # macaroonbakery # requests-oauthlib - # theblues requests-oauthlib==1.3.1 # via kubernetes rsa==4.9 # via google-auth -selenium==4.11.2 +selenium==4.12.0 # via # -r requirements-integration.in # selenium-wire @@ -199,10 +198,8 @@ 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 -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -217,7 +214,7 @@ trio==0.22.2 # via # selenium # trio-websocket -trio-websocket==0.10.3 +trio-websocket==0.10.4 # via selenium typing-extensions==4.7.1 # via @@ -232,9 +229,9 @@ urllib3[socks]==2.0.4 # selenium wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju wsproto==1.2.0 # via diff --git a/requirements-integration.in b/requirements-integration.in index 83a5597b..2e8d9484 100644 --- a/requirements-integration.in +++ b/requirements-integration.in @@ -2,9 +2,8 @@ aiohttp # Workaround for https://github.com/python-jsonschema/jsonschema/issues/1117 # and https://github.com/python-jsonschema/jsonschema/issues/1114 jsonschema<4.18 -# Pinning to <3.0 to ensure compatibility with the 2.9 controller version -# Note: 3.0 is not being maintained anymore -juju<3.0 +# Pinning to <4.0 due to compatibility with the 3.1 controller version +juju<4.0 # Need this version of kfp to work with kfp 2.0.0-alpha.7 kfp==1.8.22 lightkube diff --git a/requirements-integration.txt b/requirements-integration.txt index 95241c46..fcf50256 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -10,9 +10,9 @@ aiohttp==3.8.5 # via -r requirements-integration.in aiosignal==1.3.1 # via aiohttp -anyio==3.7.1 +anyio==4.0.0 # via httpcore -asttokens==2.2.1 +asttokens==2.4.0 # via stack-data async-timeout==4.0.3 # via aiohttp @@ -41,7 +41,7 @@ charset-normalizer==3.2.0 # via # aiohttp # requests -click==8.1.6 +click==8.1.7 # via # kfp # typer @@ -57,7 +57,7 @@ deprecated==1.2.14 # via kfp docstring-parser==0.15 # via kfp -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via # anyio # pytest @@ -94,7 +94,7 @@ google-cloud-storage==2.10.0 # via kfp google-crc32c==1.5.0 # via google-resumable-media -google-resumable-media==2.5.0 +google-resumable-media==2.6.0 # via google-cloud-storage googleapis-common-protos==1.60.0 # via google-api-core @@ -108,6 +108,8 @@ httplib2==0.22.0 # google-auth-httplib2 httpx==0.24.1 # via lightkube +hvac==1.2.0 + # via juju idna==3.4 # via # anyio @@ -130,12 +132,10 @@ jsonschema==4.17.3 # via # -r requirements-integration.in # kfp -juju==2.9.44.1 +juju==3.2.2 # via # -r requirements-integration.in # pytest-operator -jujubundlelib==0.5.7 - # via theblues kfp==1.8.22 # via -r requirements-integration.in kfp-pipeline-spec==0.1.16 @@ -148,12 +148,10 @@ kubernetes==25.3.0 # kfp lightkube==0.14.0 # via -r requirements-integration.in -lightkube-models==1.27.1.4 +lightkube-models==1.28.1.4 # via lightkube macaroonbakery==1.3.1 - # via - # juju - # theblues + # via juju markupsafe==2.1.3 # via jinja2 matplotlib-inline==0.1.6 @@ -178,7 +176,7 @@ pickleshare==0.7.5 # via ipython pkgutil-resolve-name==1.3.10 # via jsonschema -pluggy==1.2.0 +pluggy==1.3.0 # via pytest prompt-toolkit==3.0.39 # via ipython @@ -206,6 +204,8 @@ pydantic==1.10.12 # via kfp pygments==2.16.1 # via ipython +pyhcl==0.4.5 + # via hvac pymacaroons==0.13.0 # via macaroonbakery pynacl==1.5.0 @@ -221,26 +221,25 @@ pyrfc3339==1.1 # macaroonbakery pyrsistent==0.19.3 # via jsonschema -pytest==7.4.0 +pytest==7.4.2 # via # -r requirements-integration.in # pytest-asyncio # pytest-operator 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 # kfp-server-api # kubernetes -pytz==2023.3 +pytz==2023.3.post1 # via pyrfc3339 pyyaml==6.0.1 # via # -r requirements-integration.in # juju - # jujubundlelib # kfp # kubernetes # lightkube @@ -249,11 +248,11 @@ requests==2.31.0 # via # google-api-core # google-cloud-storage + # hvac # kubernetes # macaroonbakery # requests-oauthlib # requests-toolbelt - # theblues requests-oauthlib==1.3.1 # via kubernetes requests-toolbelt==0.10.1 @@ -284,12 +283,10 @@ strip-hints==0.1.10 # via kfp tabulate==0.9.0 # via kfp -tenacity==8.2.2 +tenacity==8.2.3 # via -r requirements-integration.in termcolor==2.3.0 # via fire -theblues==0.5.2 - # via juju tomli==2.0.1 # via # ipdb @@ -324,11 +321,11 @@ urllib3==1.26.16 # requests wcwidth==0.2.6 # via prompt-toolkit -websocket-client==1.6.1 +websocket-client==1.6.2 # via kubernetes -websockets==7.0 +websockets==8.1 # via juju -wheel==0.41.1 +wheel==0.41.2 # via strip-hints wrapt==1.15.0 # via deprecated