Skip to content

Commit

Permalink
build: bump juju, ops versions in ci and requirements files
Browse files Browse the repository at this point in the history
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
  • Loading branch information
DnPlas committed Apr 4, 2024
1 parent 6188a1d commit 2eac6a0
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
channel: 1.25-strict/stable
microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
charmcraft-channel: latest/candidate
juju-channel: 3.1/stable
juju-channel: 3.4/stable

- name: Run test
run: |
Expand Down
8 changes: 5 additions & 3 deletions requirements-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jedi==0.19.0
# via ipython
jinja2==3.1.2
# via pytest-operator
juju==3.2.2
juju==3.4.0.0
# via
# -r requirements-integration.in
# pytest-operator
Expand All @@ -115,7 +115,9 @@ oauthlib==3.2.2
outcome==1.2.0
# via trio
packaging==23.1
# via pytest
# via
# juju
# pytest
paramiko==2.12.0
# via juju
parso==0.8.3
Expand Down Expand Up @@ -174,7 +176,7 @@ pytest==7.4.2
# pytest-operator
pytest-asyncio==0.21.1
# via pytest-operator
pytest-operator==0.29.0
pytest-operator==0.34.0
# via -r requirements-integration.in
python-dateutil==2.8.2
# via kubernetes
Expand Down
17 changes: 2 additions & 15 deletions requirements-unit.in
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
# 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
-r requirements.in
-r requirements.txt
63 changes: 45 additions & 18 deletions requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,60 @@
# pip-compile requirements-unit.in
#
attrs==23.1.0
# via jsonschema
# via
# -r requirements.txt
# jsonschema
certifi==2023.7.22
# via requests
# via
# -r requirements.txt
# requests
charset-normalizer==3.2.0
# via requests
# via
# -r requirements.txt
# requests
coverage==7.3.0
# via -r requirements-unit.in
exceptiongroup==1.1.3
# via pytest
idna==3.4
# via requests
# via
# -r requirements.txt
# requests
importlib-resources==6.0.1
# via jsonschema
# via
# -r requirements.txt
# jsonschema
iniconfig==2.0.0
# via pytest
jinja2==3.1.2
# via -r requirements.in
# via -r requirements.txt
jsonschema==4.17.3
# via serialized-data-interface
# via
# -r requirements.txt
# serialized-data-interface
markupsafe==2.1.3
# via jinja2
# via
# -r requirements.txt
# jinja2
oci-image==1.0.0
# via -r requirements.in
ops==2.6.0
# via -r requirements.txt
ops==2.12.0
# via
# -r requirements-unit.in
# -r requirements.in
# -r requirements.txt
# serialized-data-interface
packaging==23.1
# via pytest
pkgutil-resolve-name==1.3.10
# via jsonschema
# via
# -r requirements.txt
# jsonschema
pluggy==1.3.0
# via pytest
pyrsistent==0.19.3
# via jsonschema
# via
# -r requirements.txt
# jsonschema
pytest==7.4.0
# via
# -r requirements-unit.in
Expand All @@ -52,17 +70,26 @@ pytest-mock==3.11.1
# via -r requirements-unit.in
pyyaml==6.0.1
# via
# -r requirements.txt
# ops
# serialized-data-interface
requests==2.31.0
# via serialized-data-interface
# via
# -r requirements.txt
# serialized-data-interface
serialized-data-interface==0.7.0
# via -r requirements.in
# via -r requirements.txt
tomli==2.0.1
# via pytest
urllib3==2.0.4
# via requests
# via
# -r requirements.txt
# requests
websocket-client==1.6.2
# via ops
# via
# -r requirements.txt
# ops
zipp==3.16.2
# via importlib-resources
# via
# -r requirements.txt
# importlib-resources
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ markupsafe==2.1.3
# via jinja2
oci-image==1.0.0
# via -r requirements.in
ops==2.6.0
ops==2.12.0
# via
# -r requirements.in
# serialized-data-interface
Expand Down

0 comments on commit 2eac6a0

Please sign in to comment.