Merge branch 'main' of https://github.com/DiamondLightSource/python3-pip-skeleton into dev

Author: gilesknap

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 {
     "name": "Python 3 Developer Container",
     "build": {
-        "dockerfile": "Dockerfile",
+        "dockerfile": "../Dockerfile",
         "target": "build",
         // Only upgrade pip, we will install the project below
         "args": {

.github/workflows/code.yml

@@ -134,7 +134,7 @@ jobs:
       - name: Download wheel and lockfiles
         uses: actions/download-artifact@v3
         with:
-          path: .devcontainer
+          path: artifacts/
 
       - name: Log in to GitHub Docker Registry
         if: github.event_name != 'pull_request'
@@ -166,7 +166,8 @@ jobs:
           load: ${{ ! (github.event_name == 'push' && startsWith(github.ref, 'refs/tags')) }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          context: .devcontainer
+          context: artifacts/
+          file: ./Dockerfile
           # If you have a long docker build, uncomment the following to turn on caching
           # For short build times this makes it a little slower
           #cache-from: type=gha
@@ -193,7 +194,7 @@ jobs:
       - name: Github Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
+        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: |

.github/workflows/docs.yml

@@ -46,7 +46,7 @@ jobs:
         if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: peaceiris/actions-gh-pages@de7ea6f8efb354206b205ef54722213d99067935 # v3.9.0
+        uses: peaceiris/actions-gh-pages@64b46b4226a4a12da2239ba3ea5aa73e3163c75b # v3.9.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .github/pages

.devcontainer/Dockerfile Dockerfile.devcontainer/Dockerfile renamed to Dockerfile

@@ -5,7 +5,7 @@
 #
 FROM python:3.11 as build
 
-ARG PIP_OPTIONS
+ARG PIP_OPTIONS=.
 
 # Add any system dependencies for the developer/build environment here e.g.
 # RUN apt-get update && apt-get upgrade -y && \