From b9d8b22bef4bd5d6736455717048c3799655f8cb Mon Sep 17 00:00:00 2001
From: Mia Altieri <32723809+MiaAltieri@users.noreply.github.com>
Date: Fri, 10 Jan 2025 00:43:51 -0800
Subject: [PATCH]  remove build wrapper (#55)

---
 charmcraft.yaml | 24 +++++++++---------------
 tox.ini         | 24 +-----------------------
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 8329c2ec..0c37abfc 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -7,8 +7,12 @@ bases:
     channel: "22.04"
     architectures: [amd64]
 parts:
-  charm:
-    charm-strict-dependencies: true
+  files:
+    plugin: dump
+    source: .
+    prime:
+      - charm_version
+      - workload_version
     override-build: |
       rustup default stable
       # Convert subset of poetry.lock to requirements.txt
@@ -16,25 +20,13 @@ parts:
       /root/.local/bin/poetry self add poetry-plugin-export
       /root/.local/bin/poetry export --only main,charm-libs --output requirements.txt
       craftctl default
+  charm:
     build-snaps:
       - rustup
     build-packages:
       - libffi-dev
       - libssl-dev
       - pkg-config
-    override-pull: |
-      craftctl default
-      if [[ ! -f requirements.txt ]]
-      then
-          echo 'ERROR: Use "tox run -e build-dev" instead of calling "charmcraft pack" directly' >&2
-          exit 1
-      fi
-  files:
-    plugin: dump
-    source: .
-    prime:
-      - charm_version
-      - workload_version
     override-build: |
       rustup default stable
       # Convert subset of poetry.lock to requirements.txt
@@ -42,3 +34,5 @@ parts:
       /root/.local/bin/poetry self add poetry-plugin-export
       /root/.local/bin/poetry export --only main,charm-libs --output requirements.txt
       craftctl default
+    charm-strict-dependencies: true
+    charm-requirements: [requirements.txt]
diff --git a/tox.ini b/tox.ini
index 62b8e5cb..feec3947 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,24 +17,6 @@ set_env =
 allowlist_externals =
     poetry
 
-[testenv:build-{production,dev,wrapper}]
-# Wrap `charmcraft pack`
-pass_env =
-    CI
-    GH_TOKEN
-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 =
@@ -76,12 +58,8 @@ pass_env =
     CI
     GITHUB_OUTPUT
     SECRETS_FROM_GITHUB
-allowlist_externals =
-    {[testenv:build-wrapper]allowlist_externals}
 commands_pre =
     poetry install --only integration
-    {[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}
+