Merge pull request #363 from The-Strategy-Unit/switch_to_uv

Switch to uv

Author: tomjemmett

.github/workflows/build_container.yaml

@@ -30,8 +30,71 @@ on:
         required: true
 
 jobs:
-  build-and-deploy-ghcr:
+  
+  build-container:
     runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout GitHub Action"
+        uses: actions/checkout@v4
+        
+      - name: "Login to GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Build image"
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          tags: ghcr.io/the-strategy-unit/nhp_model:pr-${{ github.event.number }}
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            app_version=${{ inputs.app-version }}
+            data_version=${{ inputs.data-version }}
+
+  add-comment-to-pr:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    needs: ["build-container"]
+    steps:
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: "## ✅ A new build is available"
+
+      - name: Comment with container image link
+        if: github.event_name == 'pull_request'
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ## ✅ A new build is available.
+
+            You can use the following to use pull the image into your local environment:
+
+            ``` bash
+            docker pull ghcr.io/the-strategy-unit/nhp_model:pr-${{ github.event.number }}
+            ```
+
+            [Download Artifact](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+          edit-mode: replace
+
+  deploy-ghcr:
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    needs: ["build-container"]
     steps:
       - name: 'Checkout GitHub Action'
         uses: actions/checkout@v4
@@ -42,29 +105,30 @@ jobs:
           registry: ghcr.io
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: 'Pull latest dev container'
-        run: |
-          docker pull ghcr.io/the-strategy-unit/nhp_model:dev
-
-      - name: 'Build image'
-        run: |
-          docker build . -t ghcr.io/the-strategy-unit/nhp_model:${{ inputs.docker-tag }} \
-            --build-arg app_version=${{ inputs.app-version }} \
-            --build-arg data_version=${{ inputs.data-version }}
-          
-      - name: 'Push image'
-        run: |
-          docker push ghcr.io/the-strategy-unit/nhp_model:${{ inputs.docker-tag }}
+      - name: "Build image"
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          tags: ghcr.io/the-strategy-unit/nhp_model:${{ inputs.docker-tag }}
+          push: true
+          cache-from: type=gha
+          build-args: |
+            app_version=${{ inputs.app-version }}
+            data_version=${{ inputs.data-version }}
       
       - name: 'Push latest'
         if: ${{ inputs.latest }}
         run: |
           docker tag ghcr.io/the-strategy-unit/nhp_model:${{ inputs.docker-tag }} ghcr.io/the-strategy-unit/nhp_model:latest
           docker push ghcr.io/the-strategy-unit/nhp_model:latest
 
-  build-and-deploy-acr:
+  deploy-acr:
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    needs: ["build-container"]
     steps:
       - name: 'Checkout GitHub Action'
         uses: actions/checkout@v4
@@ -81,22 +145,20 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
-      - name: 'Pull latest dev container'
-        run: |
-          docker pull ${{ secrets.REGISTRY_LOGIN_SERVER }}/nhp_model:dev
-
-      - name: 'Build and push image'
-        run: |
-          # include the storage account env var for the data for acr
-          docker build . -t ${{ secrets.REGISTRY_LOGIN_SERVER }}/nhp_model:${{ inputs.docker-tag }} \
-            --build-arg app_version=${{ inputs.app-version }} \
-            --build-arg data_version=${{ inputs.data-version }} \
-            --build-arg storage_account=${{ secrets.NHP_STORAGE_ACCOUNT }}
-          
-      - name: 'Push image'
-        run: |
-          docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/nhp_model:${{ inputs.docker-tag }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
+      - name: "Build image"
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          tags: ${{ secrets.REGISTRY_LOGIN_SERVER }}/nhp_model:${{ inputs.docker-tag }}
+          push: true
+          cache-from: type=gha
+          build-args: |
+            app_version=${{ inputs.app-version }}
+            data_version=${{ inputs.data-version }}
+            storage_account=${{ secrets.NHP_STORAGE_ACCOUNT }}
       - name: 'Push latest'
         if: ${{ inputs.latest }}
         run: |

.github/workflows/codecov.yaml

@@ -17,29 +17,17 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Setup Mambaforge
-      uses: conda-incubator/setup-miniconda@v3
+    - name: Install the latest version of uv
+      uses: astral-sh/setup-uv@v6
       with:
-        miniforge-version: latest
-        activate-environment: nhp
-        use-mamba: true
+        version: "latest"
+        activate-environment: true
 
-    - name: Cache Conda env
-      uses: actions/cache@v4
-      id: cache
-      with:
-        path: ${{ env.CONDA }}/envs
-        key: conda-${{ hashFiles('environment.yml') }}-${{ env.CACHE_NUMBER }}
-      env:
-        # Increase this value to reset cache if etc/example-environment.yml has not changed
-        CACHE_NUMBER: 0
-
-    - name: Update environment
-      run: mamba env update -n nhp -f environment.yml
-      if: steps.cache.outputs.cache-hit != 'true'
+    - name: Install dependencies
+      run: uv pip install -e ".[dev]"
 
     - name: Generate Report
-      run: pytest --cov=. tests/ --ignore=tests --cov-report xml:coverage.xml
+      run: uv run pytest --cov=. tests/ --ignore=tests --cov-branch --cov-report xml:coverage.xml
 
     - name: Upload Coverage to Codecov
       uses: codecov/codecov-action@v4

.github/workflows/deploy_dev.yaml

@@ -1,4 +1,6 @@
 on:
+  pull_request:
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - main
@@ -18,6 +20,7 @@ jobs:
 
   deploy-dev-schema:
     uses: ./.github/workflows/build_schema.yaml
+    if: github.event_name == 'push'
     with:
       schema-tag: dev
     secrets: inherit

.github/workflows/remove_pr_container_image.yaml

@@ -0,0 +1,32 @@
+name: Remove PR container image
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  remove-pr-image:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: "Remove pr image"
+        env:
+          TAG_TO_DELETE: "pr-${{ github.event.pull_request.number }}"
+        run: |
+          VERSION_ID=$(gh api /orgs/the-strategy-unit/packages/container/nhp_model/versions \
+            -H "Accept: application/vnd.github+json" \
+            --paginate | \
+            jq -r '.[] | select(.metadata.container.tags[] == "$TAG_TO_DELETE") | .id')
+
+          if [ -n "$VERSION_ID" ]; then
+            echo "Deleting version ID: $VERSION_ID"
+            gh api \
+              -X DELETE \
+              /orgs/the-strategy-unit/packages/container/nhp_model/versions/${VERSION_ID} \
+              -H "Accept: application/vnd.github+json"
+          else
+            echo "Tag '$TAG_TO_DELETE' not found — skipping delete"
+          fi

.github/workflows/remove_untagged_container_images.yaml

@@ -0,0 +1,28 @@
+name: Clean up untagged container images
+
+on:
+  workflow_dispatch:  # allows manual triggering via GitHub UI
+  schedule:
+    - cron: '0 1 * * *'  # runs at 01:00 UTC every day
+
+jobs:
+  removed-untagged-images:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: "Remove untagged images"
+        run: |
+          VERSION_IDS=$(gh api /orgs/the-strategy-unit/packages/container/nhp_model/versions \
+            -H "Accept: application/vnd.github+json" \
+            --paginate | \
+            jq -r '.[] | select(.metadata.container.tags | length == 0) | .id')
+
+          for VERSION_ID in $VERSION_IDS; do
+            echo "Deleting version ID: $VERSION_ID"
+            gh api \
+              -X DELETE \
+              /orgs/the-strategy-unit/packages/container/nhp_model/versions/${VERSION_ID} \
+              -H "Accept: application/vnd.github+json"
+          done