From f9d05a7af646de349aa9f541c28aea78b6220c35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 11:38:29 +0000 Subject: [PATCH 1/2] Update data-platform-workflows to v24.0.6 --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/release.yaml | 4 ++-- poetry.lock | 14 +++++++------- pyproject.toml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index abd0522..c9d2f4d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ on: jobs: lint: name: Lint - uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v24.0.0 + uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v24.0.6 unit-test: name: Unit tests @@ -60,7 +60,7 @@ jobs: charmcraft: latest/stable cache: false name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.0 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.6 with: path-to-charm-directory: ${{ matrix.charm.path }} charmcraft-snap-channel: ${{ matrix.charm.charmcraft }} @@ -85,7 +85,7 @@ jobs: - lint - unit-test - build - uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v24.0.0 + uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v24.0.6 with: artifact-prefix: temp-packed-charm cloud: ${{ matrix.cloud }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 757e732..17829d6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,14 +15,14 @@ jobs: build: name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.0 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.6 release: name: Release charm needs: - ci-tests - build - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v24.0.0 + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v24.0.6 with: channel: latest/edge artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} diff --git a/poetry.lock b/poetry.lock index 7e6e0c3..1b189ed 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1121,8 +1121,8 @@ develop = false [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.0" -resolved_reference = "8ec5cc7242d90d7ae1e125755297a97402e54584" +reference = "v24.0.6" +resolved_reference = "11c673f692893a15d15ee63469420e91f91f8a95" subdirectory = "python/pytest_plugins/github_secrets" [[package]] @@ -1159,8 +1159,8 @@ pyyaml = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.0" -resolved_reference = "8ec5cc7242d90d7ae1e125755297a97402e54584" +reference = "v24.0.6" +resolved_reference = "11c673f692893a15d15ee63469420e91f91f8a95" subdirectory = "python/pytest_plugins/pytest_operator_cache" [[package]] @@ -1178,8 +1178,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.0" -resolved_reference = "8ec5cc7242d90d7ae1e125755297a97402e54584" +reference = "v24.0.6" +resolved_reference = "11c673f692893a15d15ee63469420e91f91f8a95" subdirectory = "python/pytest_plugins/pytest_operator_groups" [[package]] @@ -1584,4 +1584,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "f59c677752f8c8e83773409f0d789afa1d6d218b161cb334d36de6d379924bbc" +content-hash = "5d946916989dbff0e97c61f328c620295405e37fabf981bf49f79027f3408e72" diff --git a/pyproject.toml b/pyproject.toml index a47682d..2528085 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,10 +31,10 @@ pytest-asyncio = "*" [tool.poetry.group.integration.dependencies] pytest = "^8.3.3" -pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/github_secrets"} +pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/github_secrets"} pytest-operator = "^0.38.0" -pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"} -pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"} +pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/pytest_operator_cache"} +pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.6", subdirectory = "python/pytest_plugins/pytest_operator_groups"} juju = "^3.5.2.0" [build-system] From a4670ea17de459c7872477c774305b4006cb0ac9 Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Wed, 8 Jan 2025 13:41:32 +0200 Subject: [PATCH 2/2] Add Poetry export plugin --- charmcraft.yaml | 1 + tests/integration/app-charm/charmcraft.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/charmcraft.yaml b/charmcraft.yaml index afd048a..4c6eb91 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -15,6 +15,7 @@ parts: override-build: | # Convert subset of poetry.lock to requirements.txt curl -sSL https://install.python-poetry.org | python3 - + /root/.local/bin/poetry self add poetry-plugin-export /root/.local/bin/poetry export --only main,charm-libs --output requirements.txt craftctl default diff --git a/tests/integration/app-charm/charmcraft.yaml b/tests/integration/app-charm/charmcraft.yaml index b4ce134..631ec84 100644 --- a/tests/integration/app-charm/charmcraft.yaml +++ b/tests/integration/app-charm/charmcraft.yaml @@ -14,6 +14,7 @@ parts: override-build: | # Convert subset of poetry.lock to requirements.txt curl -sSL https://install.python-poetry.org | python3 - + /root/.local/bin/poetry self add poetry-plugin-export /root/.local/bin/poetry export --only main,charm-libs --output requirements.txt craftctl default