From 95fce2208540f5b0ae4816b6a12431142e19dda5 Mon Sep 17 00:00:00 2001 From: Daniela Plascencia Date: Thu, 4 Apr 2024 13:44:02 +0200 Subject: [PATCH] build: bump juju, ops versions in ci and requirements files Bumping juju and ops packages to use them in newer versions of the charms, plus testing them in a CI with a more recent juju version. Part of canonical/bundle-kubeflow#859 --- .github/workflows/integrate.yaml | 2 +- requirements-integration.txt | 8 ++- requirements-unit.in | 17 +---- requirements-unit.txt | 107 +++++++++++++++++++++++-------- requirements.txt | 2 +- 5 files changed, 88 insertions(+), 48 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 61a6f3c..c61997c 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -54,7 +54,7 @@ jobs: with: provider: microk8s channel: 1.25-strict/stable - juju-channel: 3.1/stable + juju-channel: 3.4/stable charmcraft-channel: latest/stable - name: Test diff --git a/requirements-integration.txt b/requirements-integration.txt index dd01571..dc37a39 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -66,7 +66,7 @@ jinja2==3.1.2 # via # -r requirements-integration.in # pytest-operator -juju==3.2.2 +juju==3.4.0.0 # via # -r requirements-integration.in # pytest-operator @@ -89,7 +89,9 @@ oauthlib==3.2.2 # kubernetes # requests-oauthlib packaging==23.1 - # via pytest + # via + # juju + # pytest paramiko==2.12.0 # via juju parso==0.8.3 @@ -140,7 +142,7 @@ pytest==7.4.2 # pytest-timeout pytest-asyncio==0.21.1 # via pytest-operator -pytest-operator==0.29.0 +pytest-operator==0.34.0 # via -r requirements-integration.in pytest-timeout==2.1.0 # via -r requirements-integration.in diff --git a/requirements-unit.in b/requirements-unit.in index 421af66..97081f5 100644 --- a/requirements-unit.in +++ b/requirements-unit.in @@ -1,22 +1,9 @@ -# Copyright 2023 Canonical Ltd. +# Copyright 2024 Canonical Ltd. # See LICENSE file for licensing details. -# Please note this file introduces dependencies from the charm's requirements.in, -# special attention must be taken when updating this or the other .in file to try -# to avoid incompatibilities. -# Rules for editing this file: -# * Removing a dependency that is no longer used in the unit test file(s) -# is allowed, and should not represent any risk. -# * Adding a dependency in this file means the dependency is directly used -# in the unit test files(s). -# * ALL python packages/libs used directly in the unit test file(s) must be -# listed here even if requirements.in is already adding them. This will -# add clarity to the dependency list. -# * Pinning a version of a python package/lib shared with requirements.in -# must not introduce any incompatibilities. coverage ops pytest pytest-mock pytest-lazy-fixture pyyaml --r requirements.in +-r requirements.txt diff --git a/requirements-unit.txt b/requirements-unit.txt index 9f57290..e0846dc 100644 --- a/requirements-unit.txt +++ b/requirements-unit.txt @@ -5,69 +5,104 @@ # pip-compile requirements-unit.in # anyio==3.7.1 - # via httpcore + # via + # -r requirements.txt + # httpcore attrs==23.1.0 - # via jsonschema + # via + # -r requirements.txt + # jsonschema certifi==2023.7.22 # via + # -r requirements.txt # httpcore # httpx # requests charmed-kubeflow-chisme==0.2.0 - # via -r requirements.in + # via -r requirements.txt charset-normalizer==3.2.0 - # via requests + # via + # -r requirements.txt + # requests coverage==7.3.0 # via -r requirements-unit.in deepdiff==6.2.1 - # via charmed-kubeflow-chisme + # via + # -r requirements.txt + # charmed-kubeflow-chisme exceptiongroup==1.1.2 # via + # -r requirements.txt # anyio # pytest h11==0.14.0 - # via httpcore + # via + # -r requirements.txt + # httpcore httpcore==0.17.3 - # via httpx + # via + # -r requirements.txt + # httpx httpx==0.24.1 - # via lightkube + # via + # -r requirements.txt + # lightkube idna==3.4 # via + # -r requirements.txt # anyio # httpx # requests importlib-resources==6.0.1 - # via jsonschema + # via + # -r requirements.txt + # jsonschema iniconfig==2.0.0 # via pytest jinja2==3.1.2 - # via charmed-kubeflow-chisme + # via + # -r requirements.txt + # charmed-kubeflow-chisme jsonschema==4.17.3 - # via serialized-data-interface + # via + # -r requirements.txt + # serialized-data-interface lightkube==0.14.0 - # via charmed-kubeflow-chisme + # via + # -r requirements.txt + # charmed-kubeflow-chisme lightkube-models==1.27.1.4 - # via lightkube + # via + # -r requirements.txt + # lightkube markupsafe==2.1.3 - # via jinja2 + # via + # -r requirements.txt + # jinja2 oci-image==1.0.0 - # via -r requirements.in -ops==2.5.0 + # via -r requirements.txt +ops==2.12.0 # via # -r requirements-unit.in - # -r requirements.in + # -r requirements.txt # charmed-kubeflow-chisme # serialized-data-interface ordered-set==4.1.0 - # via deepdiff + # via + # -r requirements.txt + # deepdiff packaging==23.1 # via pytest pkgutil-resolve-name==1.3.10 - # via jsonschema + # via + # -r requirements.txt + # jsonschema pluggy==1.2.0 # via pytest pyrsistent==0.19.3 - # via jsonschema + # via + # -r requirements.txt + # jsonschema pytest==7.4.0 # via # -r requirements-unit.in @@ -80,31 +115,47 @@ pytest-mock==3.11.1 pyyaml==6.0.1 # via # -r requirements-unit.in + # -r requirements.txt # lightkube # ops # serialized-data-interface requests==2.31.0 - # via serialized-data-interface + # via + # -r requirements.txt + # serialized-data-interface ruamel-yaml==0.17.32 - # via charmed-kubeflow-chisme + # via + # -r requirements.txt + # charmed-kubeflow-chisme ruamel-yaml-clib==0.2.7 - # via ruamel-yaml + # via + # -r requirements.txt + # ruamel-yaml serialized-data-interface==0.3.6 # via - # -r requirements.in + # -r requirements.txt # charmed-kubeflow-chisme sniffio==1.3.0 # via + # -r requirements.txt # anyio # httpcore # httpx tenacity==8.2.2 - # via charmed-kubeflow-chisme + # via + # -r requirements.txt + # charmed-kubeflow-chisme tomli==2.0.1 # via pytest urllib3==2.0.4 - # via requests + # via + # -r requirements.txt + # requests websocket-client==1.6.1 - # via ops + # via + # -r requirements.txt + # ops zipp==3.16.2 - # via importlib-resources + # via + # -r requirements.txt + # importlib-resources diff --git a/requirements.txt b/requirements.txt index a6185ed..6f6c0b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -46,7 +46,7 @@ markupsafe==2.1.3 # via jinja2 oci-image==1.0.0 # via -r requirements.in -ops==2.5.0 +ops==2.12.0 # via # -r requirements.in # charmed-kubeflow-chisme