From ff21e91ba7a41b8e9221981d9faa21dd460729ab Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Tue, 25 Jun 2024 15:35:55 +0200 Subject: [PATCH] update dpw --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/release.yaml | 4 ++-- .github/workflows/sync_docs.yaml | 2 +- .github/workflows/sync_issue_to_jira.yaml | 2 +- poetry.lock | 18 +++++++++--------- pyproject.toml | 8 ++++---- tox.ini | 1 + 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4eba9c5077..295ab4e27d 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.1.0 + uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v16.2.0 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.1.0 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.2.0 with: cache: true @@ -70,7 +70,7 @@ jobs: - lint - unit-test - build - uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v16.1.0 + uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v16.2.0 with: artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} architecture: ${{ matrix.architecture }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 726b455c9b..38a32ee87f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,14 +52,14 @@ jobs: build: name: Build charm - uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.1.0 + uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v16.2.0 release: name: Release charm needs: - ci-tests - build - uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v16.1.0 + uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v16.2.0 with: channel: 14/edge artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} diff --git a/.github/workflows/sync_docs.yaml b/.github/workflows/sync_docs.yaml index eeb1838963..220f0edf1b 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@v16.1.0 + uses: canonical/data-platform-workflows/.github/workflows/_sync_docs.yaml@v16.2.0 secrets: discourse-api-user: ${{ secrets.DISCOURSE_API_USERNAME }} discourse-api-key: ${{ secrets.DISCOURSE_API_KEY }} diff --git a/.github/workflows/sync_issue_to_jira.yaml b/.github/workflows/sync_issue_to_jira.yaml index fbab86e436..a1a3dfc582 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.1.0 + uses: canonical/data-platform-workflows/.github/workflows/sync_issue_to_jira.yaml@v16.2.0 with: jira-base-url: https://warthogs.atlassian.net jira-project-key: DPE diff --git a/poetry.lock b/poetry.lock index 1dc176ff2a..9e005e8088 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.1.0" -resolved_reference = "cd382c222cc763a9105ae5cbf41afd7062f2a41c" +reference = "v16.2.0" +resolved_reference = "eb5c6fc3c725f0ec870be8055508e23b49126dc9" subdirectory = "python/pytest_plugins/allure_pytest_collection_report" [[package]] @@ -1702,8 +1702,8 @@ develop = false [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.1.0" -resolved_reference = "cd382c222cc763a9105ae5cbf41afd7062f2a41c" +reference = "v16.2.0" +resolved_reference = "eb5c6fc3c725f0ec870be8055508e23b49126dc9" subdirectory = "python/pytest_plugins/github_secrets" [[package]] @@ -1757,8 +1757,8 @@ pyyaml = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.1.0" -resolved_reference = "cd382c222cc763a9105ae5cbf41afd7062f2a41c" +reference = "v16.2.0" +resolved_reference = "eb5c6fc3c725f0ec870be8055508e23b49126dc9" subdirectory = "python/pytest_plugins/pytest_operator_cache" [[package]] @@ -1776,8 +1776,8 @@ pytest = "*" [package.source] type = "git" url = "https://github.com/canonical/data-platform-workflows" -reference = "v16.1.0" -resolved_reference = "cd382c222cc763a9105ae5cbf41afd7062f2a41c" +reference = "v16.2.0" +resolved_reference = "eb5c6fc3c725f0ec870be8055508e23b49126dc9" subdirectory = "python/pytest_plugins/pytest_operator_groups" [[package]] @@ -2414,4 +2414,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "9f1a3524f524e14fad5f0d5edccc687a3b24bdf4f2dba591419dedcaf034cedc" +content-hash = "1ccbcb9a435e0155816ed6be6d21b83edf6d550b05f68e0c24f39b428390bb6e" diff --git a/pyproject.toml b/pyproject.toml index e623d5a7ae..39e0851306 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,11 +71,11 @@ optional = true [tool.poetry.group.integration.dependencies] lightkube = "^0.15.3" pytest = "^8.2.2" -pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.1.0", subdirectory = "python/pytest_plugins/github_secrets"} +pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.0", subdirectory = "python/pytest_plugins/github_secrets"} pytest-operator = "^0.35.0" -pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.1.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"} -pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.1.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"} -allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.1.0", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} +pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"} +pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"} +allure-pytest-collection-report = {git = "https://github.com/canonical/data-platform-workflows", tag = "v16.2.0", subdirectory = "python/pytest_plugins/allure_pytest_collection_report"} # renovate caret doesn't work: https://github.com/renovatebot/renovate/issues/26940 juju = "<=3.5.0.0" psycopg2-binary = "^2.9.9" diff --git a/tox.ini b/tox.ini index 43e7eaec32..5ea93b8562 100644 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,7 @@ allowlist_externals = # Wrap `charmcraft pack` pass_env = CI + GH_TOKEN allowlist_externals = {[testenv]allowlist_externals} charmcraft