Switch from tox build wrapper to charmcraft.yaml overrides (#221)

https://warthogs.atlassian.net/browse/DPE-5046 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Carl Csaposs <[email protected]>
canonical · Sep 26, 2024 · df4b7c6 · df4b7c6
1 parent fddfd63
commit df4b7c6
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 57 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,11 +20,11 @@ on:
 jobs:
   lint:
     name: Lint
-    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v21.0.1
+    uses: canonical/data-platform-workflows/.github/workflows/lint.yaml@v22.0.0
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v21.0.1
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v22.0.0
     with:
       cache: true
 
@@ -43,7 +43,7 @@ jobs:
     needs:
       - lint
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v21.0.1
+    uses: canonical/data-platform-workflows/.github/workflows/integration_test_charm.yaml@v22.0.0
     with:
       artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
       cloud: ${{ matrix.cloud }}

diff --git a/.github/workflows/lib-check.yaml b/.github/workflows/lib-check.yaml
@@ -26,17 +26,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up environment
-        run: |
-          pipx install tox
-          pipx install poetry
-          pipx inject poetry poetry-plugin-export
-          # TODO: Remove after https://github.com/python-poetry/poetry/pull/5980 is closed
-          poetry config warnings.export false
-      - name: Generate requirements
-        run: |
-          tox run -e build-wrapper
-          mv requirements-last-build.txt requirements.txt
       - name: Check libs
         uses: canonical/charming-actions/[email protected]
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,14 +22,14 @@ jobs:
 
   build:
     name: Build charm
-    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v21.0.1
+    uses: canonical/data-platform-workflows/.github/workflows/build_charm.yaml@v22.0.0
 
   release:
     name: Release charm
     needs:
       - ci-tests
       - build
-    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v21.0.1
+    uses: canonical/data-platform-workflows/.github/workflows/release_charm.yaml@v22.0.0
     with:
       channel: edge
       artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ tox run -e lint          # code style
 Build the charm in this git repository using:
 
 ```shell
-tox run -e build-dev
+charmcraftcache pack
 ```
 
 ### Deploy

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -11,14 +11,14 @@ bases:
     architectures: [arm64]
 parts:
   charm:
-    override-pull: |
+    override-build: |
+      # Convert subset of poetry.lock to requirements.txt
+      curl -sSL https://install.python-poetry.org | python3 -
+      /root/.local/bin/poetry export --only main,charm-libs --output requirements.txt
+
       craftctl default
-      if [[ ! -f requirements.txt ]]
-      then
-          echo 'ERROR: Use "tox run -e build" instead of calling "charmcraft pack" directly' >&2
-          exit 1
-      fi
     charm-strict-dependencies: true
+    charm-requirements: [requirements.txt]
   libpq:
     build-packages:
       - libpq-dev

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,10 +40,10 @@ optional = true
 
 [tool.poetry.group.integration.dependencies]
 pytest = "^8.3.3"
-pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v21.0.1", subdirectory = "python/pytest_plugins/github_secrets"}
+pytest-github-secrets = {git = "https://github.com/canonical/data-platform-workflows", tag = "v22.0.0", subdirectory = "python/pytest_plugins/github_secrets"}
 pytest-operator = "^0.37.0"
-pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v21.0.1", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
-pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v21.0.1", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
+pytest-operator-cache = {git = "https://github.com/canonical/data-platform-workflows", tag = "v22.0.0", subdirectory = "python/pytest_plugins/pytest_operator_cache"}
+pytest-operator-groups = {git = "https://github.com/canonical/data-platform-workflows", tag = "v22.0.0", subdirectory = "python/pytest_plugins/pytest_operator_groups"}
 # renovate caret doesn't work: https://github.com/renovatebot/renovate/issues/26940
 juju = "<=3.5.2.0"
 

diff --git a/tox.ini b/tox.ini
@@ -19,24 +19,6 @@ set_env =
 allowlist_externals =
     poetry
 
-[testenv:build-{production,dev,wrapper}]
-pass_env =
-    CI
-    GH_TOKEN
-# Wrap `charmcraft pack`
-allowlist_externals =
-    {[testenv]allowlist_externals}
-    charmcraft
-    charmcraftcache
-    mv
-commands_pre =
-    poetry export --only main,charm-libs --output requirements.txt
-commands =
-    build-production: charmcraft pack {posargs}
-    build-dev: charmcraftcache pack {posargs}
-commands_post =
-    mv requirements.txt requirements-last-build.txt
-
 [testenv:format]
 description = Apply coding style standards to code
 commands_pre =
@@ -70,12 +52,7 @@ pass_env =
     CI
     GITHUB_OUTPUT
     SECRETS_FROM_GITHUB
-allowlist_externals =
-    {[testenv:build-wrapper]allowlist_externals}
 commands_pre =
     poetry install --only integration --no-root
-    {[testenv:build-wrapper]commands_pre}
 commands =
     poetry run pytest -v --tb native --log-cli-level=INFO -s --ignore={[vars]tests_path}/unit/ {posargs}
-commands_post =
-    {[testenv:build-wrapper]commands_post}