tidy workflows

.github/workflows/deploy_to_pypi.yml

@@ -2,43 +2,40 @@ name: Publish the completed package to Pypi
 
 on:
   workflow_call:
+    inputs:
+      workflow_run_id:
+        type: string
+        required: true
+        description: 'The ID of the workflow which triggered this workflow'
+      artefact-version:
+        type: string
+        required: true
+        description: 'the version of the artefact'
 
-# permissions:                    # Global permissions configuration starts here
-#   contents: read                # 'read' access to repository contents
-#   pull-requests: read          # 'write' access to pull requests
 
 jobs:
 
-  deploy_to_pypi:
+  deploy_to_pypi_test:
     runs-on: ubuntu-latest
     environment: 
       name: 'published'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - name: download artefact from previous run
+        uses: actions/download-artifact@v4
         with:
-          fetch-depth: 2
-      - name: Set up Python
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
-        with:
-          python-version: 3.12
-      - uses: snok/install-poetry@93ada01c735cc8a383ce0ce2ae205a21c415379b # v1
-        with:
-          version: 1.8.3 # pin the version as they keep changing their APIs
-          virtualenvs-create: false
-          virtualenvs-in-project: false
-      - name: Install dependencies
+          run-id: ${{ github.event.inputs.workflow_run_id }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: extract artefact
         run: |
-          python -m venv venv
-          . venv/bin/activate
-          poetry install --with dev --no-interaction --sync
-          python  -c "import os; print(os.environ['VIRTUAL_ENV'])"
-      - name: Build
-        run: poetry build
-      - name: Use Pypi test
+          tar -xvf *.tar.gz
+      - name: extract version from pyproject.toml
         run: |
-          poetry config repositories.test-pypi https://test.pypi.org/legacy/
-          poetry config pypi-token.test-pypi  ${{ secrets.PYPI_TOKEN }}
-      - name: Publish
-        run: poetry publish -r test-pypi
+          version=$(grep 'version =' pyproject.toml | awk '{print $3}' | sed 's/"//g')
+          echo "VERSION=$version" >> $GITHUB_ENV
+      - name: Publish package distributions to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
 
 

.github/workflows/CD/build_and_deploy_on_merge_to_main.yml → .github/workflows/deploy_workflow_wrapper.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   bump:
-    uses: ./.github/workflows/CD/bump_version.yml
+    uses: ./.github/workflows/deploy_bump_version.yml
     environment: 
       name: 'bump-version'
     runs-on: ubuntu-latest

.github/workflows/codeql.yml → .github/workflows/test_codeql.yml

@@ -13,9 +13,9 @@ name: CodeQL
 
 on:
   workflow_call:
-  push:
-    branches-ignore:
-      - main
+  # push:
+  #   branches-ignore:
+  #     - main
   schedule:
     - cron: "43 4 * * 3"
 

.github/workflows/dependency-review.yml → .github/workflows/test_dependency_review.yml

@@ -6,7 +6,7 @@
 # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
 name: 'Dependency Review'
 on:
-  pull_request:
+  workflow_call:
 
 permissions:
   contents: read

.github/workflows/test-workflow.yml → .github/workflows/test_run_pytest.yml

@@ -2,9 +2,9 @@ name: test package
 
 on:
   workflow_call:
-  push:
-      branches-ignore:
-          - main
+  # push:
+  #     branches-ignore:
+  #         - main
 
 
 permissions:                    # Global permissions configuration starts here

.github/workflows/test_build_bump_version.yml → .github/workflows/test_workflow_wrapper.yml

@@ -14,10 +14,13 @@ jobs:
       actions: read
       contents: read
       security-events: write
-    uses: ./.github/workflows/codeql.yml
+    uses: ./.github/workflows/test_codeql.yml
 
   test:
-    uses: ./.github/workflows/test-workflow.yml
+    uses: ./.github/workflows/test_run_pytest.yml
+
+  dependencies:
+    uses: ./.github/workflows/test_dependency_review.yml
 
 
   # bump_version: