From db647e8d853627ca3ec263fd32d064247dde97b3 Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Mon, 6 Jan 2025 17:50:37 +0200 Subject: [PATCH] Disable juju 3.6 --- .github/workflows/ci.yaml | 15 ++++----------- .github/workflows/release.yaml | 4 ++-- .github/workflows/sync_docs.yaml | 2 +- charmcraft.yaml | 1 + poetry.lock | 22 ++++++++++++---------- pyproject.toml | 8 ++++---- 6 files changed, 24 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1e5c20d6e..87bfb52bf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ on: jobs: lint: name: Lint - uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v24.0.2 + uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v24.0.5 unit-test: name: Unit test charm @@ -45,7 +45,7 @@ jobs: build: name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.2 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.5 with: cache: true @@ -59,8 +59,6 @@ jobs: allure_on_amd64: false - agent: 3.4.6 # renovate: juju-agent-pin-minor allure_on_amd64: true - - snap_channel: 3.6/stable - allure_on_amd64: false architecture: - amd64 include: @@ -68,22 +66,17 @@ jobs: agent: 3.4.6 # renovate: juju-agent-pin-minor allure_on_amd64: true architecture: arm64 - - juju: - snap_channel: 3.6/stable - allure_on_amd64: false - architecture: arm64 - name: Integration | ${{ matrix.juju.agent || matrix.juju.snap_channel }} | ${{ matrix.architecture }} + name: Integration | ${{ matrix.juju.agent }} | ${{ matrix.architecture }} needs: - lint - unit-test - build - uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v24.0.2 + uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v24.0.5 with: artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} architecture: ${{ matrix.architecture }} cloud: lxd juju-agent-version: ${{ matrix.juju.agent }} - juju-snap-channel: ${{ matrix.juju.snap_channel }} libjuju-version-constraint: ${{ matrix.juju.libjuju }} _beta_allure_report: ${{ matrix.juju.allure_on_amd64 && matrix.architecture == 'amd64' }} permissions: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c83edf0d7..8975e6fb3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -25,14 +25,14 @@ jobs: build: name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.2 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v24.0.5 release: name: Release charm needs: - ci-tests - build - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v24.0.2 + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v24.0.5 with: channel: 1/edge artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} diff --git a/.github/workflows/sync_docs.yaml b/.github/workflows/sync_docs.yaml index ceffe91b1..04ce0b134 100644 --- a/.github/workflows/sync_docs.yaml +++ b/.github/workflows/sync_docs.yaml @@ -10,7 +10,7 @@ on: jobs: sync-docs: name: Sync docs from Discourse - uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v24.0.2 + uses: canonical/data-platform-workflows/.github/workflows/sync_docs.yaml@v24.0.5 with: reviewers: a-velasco permissions: diff --git a/charmcraft.yaml b/charmcraft.yaml index c438f0100..cc89f571d 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -30,6 +30,7 @@ parts: # 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/poetry.lock b/poetry.lock index d43310a85..d57f18ac5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand. [[package]] name = "allure-pytest" @@ -31,8 +31,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.2" -resolved_reference = "f92457d41a392c2549c044efe40651186db62d10" +reference = "v24.0.5" +resolved_reference = "078fb649213bbffe223e826f04560c2e9c9c3396" subdirectory = "python/pytest_plugins/allure_pytest_collection_report" [[package]] @@ -1551,6 +1551,7 @@ files = [ {file = "psycopg2-2.9.10-cp311-cp311-win_amd64.whl", hash = "sha256:0435034157049f6846e95103bd8f5a668788dd913a7c30162ca9503fdf542cb4"}, {file = "psycopg2-2.9.10-cp312-cp312-win32.whl", hash = "sha256:65a63d7ab0e067e2cdb3cf266de39663203d38d6a8ed97f5ca0cb315c73fe067"}, {file = "psycopg2-2.9.10-cp312-cp312-win_amd64.whl", hash = "sha256:4a579d6243da40a7b3182e0430493dbd55950c493d8c68f4eec0b302f6bbf20e"}, + {file = "psycopg2-2.9.10-cp313-cp313-win_amd64.whl", hash = "sha256:91fd603a2155da8d0cfcdbf8ab24a2d54bca72795b90d2a3ed2b6da8d979dee2"}, {file = "psycopg2-2.9.10-cp39-cp39-win32.whl", hash = "sha256:9d5b3b94b79a844a986d029eee38998232451119ad653aea42bb9220a8c5066b"}, {file = "psycopg2-2.9.10-cp39-cp39-win_amd64.whl", hash = "sha256:88138c8dedcbfa96408023ea2b0c369eda40fe5d75002c0964c78f46f11fa442"}, {file = "psycopg2-2.9.10.tar.gz", hash = "sha256:12ec0b40b0273f95296233e8750441339298e6a572f7039da5b260e3c8b60e11"}, @@ -1610,6 +1611,7 @@ files = [ {file = "psycopg2_binary-2.9.10-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909"}, {file = "psycopg2_binary-2.9.10-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1"}, {file = "psycopg2_binary-2.9.10-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567"}, + {file = "psycopg2_binary-2.9.10-cp313-cp313-win_amd64.whl", hash = "sha256:27422aa5f11fbcd9b18da48373eb67081243662f9b46e6fd07c3eb46e4535142"}, {file = "psycopg2_binary-2.9.10-cp38-cp38-macosx_12_0_x86_64.whl", hash = "sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4"}, {file = "psycopg2_binary-2.9.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8"}, {file = "psycopg2_binary-2.9.10-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864"}, @@ -1873,8 +1875,8 @@ develop = false [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.2" -resolved_reference = "f92457d41a392c2549c044efe40651186db62d10" +reference = "v24.0.5" +resolved_reference = "078fb649213bbffe223e826f04560c2e9c9c3396" subdirectory = "python/pytest_plugins/github_secrets" [[package]] @@ -1911,8 +1913,8 @@ pyyaml = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.2" -resolved_reference = "f92457d41a392c2549c044efe40651186db62d10" +reference = "v24.0.5" +resolved_reference = "078fb649213bbffe223e826f04560c2e9c9c3396" subdirectory = "python/pytest_plugins/pytest_operator_cache" [[package]] @@ -1930,8 +1932,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v24.0.2" -resolved_reference = "f92457d41a392c2549c044efe40651186db62d10" +reference = "v24.0.5" +resolved_reference = "078fb649213bbffe223e826f04560c2e9c9c3396" subdirectory = "python/pytest_plugins/pytest_operator_groups" [[package]] @@ -2623,4 +2625,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.9 || >=3.10,<4" -content-hash = "e9b8f176f0c1ea087cd131323796ecdb7b45b87f0b3b1744340fcb1ed5b913cb" +content-hash = "fb4f6ac599bbc8ff8cae96e65f6a99f30bb2e526ef5b17b6abeb62a0771f901a" diff --git a/pyproject.toml b/pyproject.toml index 0b4d225f7..4a88f279b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,10 +61,10 @@ optional = true [tool.poetry.group.integration.dependencies] pytest = "^8.3.4" -pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.2", subdirectory = "python/pytest_plugins/github_secrets"} +pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.5", subdirectory = "python/pytest_plugins/github_secrets"} pytest-operator = "^0.39.0" -pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.2", subdirectory = "python/pytest_plugins/pytest_operator_cache"} -pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.2", subdirectory = "python/pytest_plugins/pytest_operator_groups"} +pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.5", subdirectory = "python/pytest_plugins/pytest_operator_cache"} +pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.5", subdirectory = "python/pytest_plugins/pytest_operator_groups"} # renovate caret doesn't work: https://github.com/renovatebot/renovate/issues/26940 juju = "<=3.6.1.0" tenacity = "*" @@ -72,7 +72,7 @@ mailmanclient = "^3.3.5" psycopg2-binary = "^2.9.10" landscape-api-py3 = "^0.9.0" allure-pytest = "^2.13.5" -allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.2", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} +allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v24.0.5", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} [build-system] requires = ["poetry-core>=1.0.0"]