From 46d1110679d57bc48c77a6db156054dbf5e99187 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 01:32:59 +0000 Subject: [PATCH 1/2] Update data-platform-workflows to v16.2.1 --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/release.yaml | 4 ++-- .github/workflows/sync_issue_to_jira.yaml | 2 +- poetry.lock | 18 +++++++++--------- pyproject.toml | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0bbcc8b058..6e5e974ca6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,7 +22,7 @@ on: jobs: lint: name: Lint - uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v16.0.1 + uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v16.2.1 unit-test: name: Unit test charm @@ -44,7 +44,7 @@ jobs: build: name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.0.1 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.2.1 with: cache: true @@ -70,7 +70,7 @@ jobs: - lint - unit-test - build - uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v16.0.1 + uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v16.2.1 with: artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} architecture: ${{ matrix.architecture }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ffa4a94522..85dc56026f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,14 +24,14 @@ jobs: build: name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.0.1 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.2.1 release: name: Release charm needs: - ci-tests - build - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v16.0.1 + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v16.2.1 with: channel: 14/edge artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} diff --git a/.github/workflows/sync_issue_to_jira.yaml b/.github/workflows/sync_issue_to_jira.yaml index 32f2f646fa..07aefd4c7e 100644 --- a/.github/workflows/sync_issue_to_jira.yaml +++ b/.github/workflows/sync_issue_to_jira.yaml @@ -9,7 +9,7 @@ on: jobs: sync: name: Sync GitHub issue to Jira - uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v16.0.1 + uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v16.2.1 with: jira-base-url: https://warthogs.atlassian.net jira-project-key: DPE diff --git a/poetry.lock b/poetry.lock index 588bfffec5..84f91654a3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -31,8 +31,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.0.1" -resolved_reference = "2e008de51f6768c72ca711cce4976a80f52bcc31" +reference = "v16.2.1" +resolved_reference = "ddb4b5112daf309a5665e14caa5dfee03b96eae0" subdirectory = "python/pytest_plugins/allure_pytest_collection_report" [[package]] @@ -1647,8 +1647,8 @@ develop = false [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.0.1" -resolved_reference = "2e008de51f6768c72ca711cce4976a80f52bcc31" +reference = "v16.2.1" +resolved_reference = "ddb4b5112daf309a5665e14caa5dfee03b96eae0" subdirectory = "python/pytest_plugins/github_secrets" [[package]] @@ -1685,8 +1685,8 @@ pyyaml = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.0.1" -resolved_reference = "2e008de51f6768c72ca711cce4976a80f52bcc31" +reference = "v16.2.1" +resolved_reference = "ddb4b5112daf309a5665e14caa5dfee03b96eae0" subdirectory = "python/pytest_plugins/pytest_operator_cache" [[package]] @@ -1704,8 +1704,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.0.1" -resolved_reference = "2e008de51f6768c72ca711cce4976a80f52bcc31" +reference = "v16.2.1" +resolved_reference = "ddb4b5112daf309a5665e14caa5dfee03b96eae0" subdirectory = "python/pytest_plugins/pytest_operator_groups" [[package]] @@ -2342,4 +2342,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "0608b10863a8d2f6802057857e8f921d938dc26fc7c3c9cdde04560ab344524c" +content-hash = "0c73d035193d530c74be5dd329fc5f312c0a597a5fe48e875fee6273e34273a5" diff --git a/pyproject.toml b/pyproject.toml index aa64c9b22c..f1f720494d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,10 +68,10 @@ optional = true [tool.poetry.group.integration.dependencies] pytest = "^8.2.2" -pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.0.1", subdirectory = "python/pytest_plugins/github_secrets"} +pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.1", subdirectory = "python/pytest_plugins/github_secrets"} pytest-operator = "^0.35.0" -pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.0.1", subdirectory = "python/pytest_plugins/pytest_operator_cache"} -pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.0.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"} +pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.1", subdirectory = "python/pytest_plugins/pytest_operator_cache"} +pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"} # renovate caret doesn't work: https://github.com/renovatebot/renovate/issues/26940 juju = "<=3.5.0.0" boto3 = "*" @@ -80,7 +80,7 @@ landscape-api-py3 = "^0.9.0" mailmanclient = "^3.3.5" psycopg2-binary = "^2.9.9" allure-pytest = "^2.13.5" -allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.0.1", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} +allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.1", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} # Testing tools configuration [tool.coverage.run] From 622c6b2ea8a316e55751c70c16886b8ce9f04f42 Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Wed, 26 Jun 2024 08:55:33 +0000 Subject: [PATCH 2/2] Update tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 18edb1846a..3fc65f9aaf 100644 --- a/tox.ini +++ b/tox.ini @@ -21,6 +21,7 @@ allowlist_externals = # Wrap `charmcraft pack` pass_env = CI + GH_TOKEN allowlist_externals = {[testenv]allowlist_externals} charmcraft