Merge branch 'refresh-v3' into dpe-8462-jubilant

Author: dragomirp

.github/workflows/release.yaml

@@ -16,18 +16,9 @@ on:
       - '.github/workflows/sync_docs.yaml'
 
 jobs:
-  tag:
-    name: Create charm refresh compatibility version git tag
-    uses: canonical/data-platform-workflows/.github/workflows/tag_charm_edge.yaml@v35.0.2
-    with:
-      track: '16'
-    permissions:
-      contents: write  # Needed to create git tag
 
   ci-tests:
     name: Tests
-    needs:
-      - tag
     uses: ./.github/workflows/ci.yaml
     secrets: inherit
     permissions:
@@ -36,11 +27,10 @@ jobs:
   release:
     name: Release charm
     needs:
-      - tag
       - ci-tests
     uses: canonical/data-platform-workflows/.github/workflows/release_charm_edge.yaml@v35.0.2
     with:
-      track: ${{ needs.tag.outputs.track }}
+      track: '16'
       artifact-prefix: ${{ needs.ci-tests.outputs.artifact-prefix }}
     secrets:
       charmhub-token: ${{ secrets.CHARMHUB_TOKEN }}

charmcraft.yaml

@@ -84,19 +84,6 @@ parts:
   files:
     plugin: dump
     source: .
-    after:
-      - poetry-deps  # Ensure poetry is installed
-    build-packages:
-      - git
-    override-build: |
-      # Set `charm_version` in refresh_versions.toml from git tag
-      # Create venv in `..` so that git working tree is not dirty
-      python3 -m venv ../refresh-version-venv
-      source ../refresh-version-venv/bin/activate
-      poetry install --only build-refresh-version
-      write-charm-version
-
-      craftctl default
     stage:
       - LICENSE
       - refresh_versions.toml

poetry.lock

@@ -76,12 +76,6 @@ jubilant = "^1.5.0"
 tomli-w = "^1.2.0"
 tomli = "^2.3.0"
 
-[tool.poetry.group.build-refresh-version]
-optional = true
-
-[tool.poetry.group.build-refresh-version.dependencies]
-charm-refresh-build-version = "^0.4.0"
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -1,4 +1,5 @@
 # https://canonical-charm-refresh.readthedocs-hosted.com/latest/refresh-versions-toml/
 
+charm = "16/1.0.0"
 charm_major = 1
 workload = "16.10"

refresh_versions.toml

@@ -333,7 +333,6 @@ def __init__(self, *args):
             self.refresh is not None
             and self.refresh.workload_allowed_to_start
             and not self.refresh.next_unit_allowed_to_refresh
-            and int(self.unit.name.split("/")[1]) >= self.refresh._get_partition()
         ):
             if self.refresh.in_progress:
                 self.reconcile()