Merge remote-tracking branch 'origin/develop' into mount_points

.github/ISSUE_TEMPLATE/release_checklist.md

@@ -25,12 +25,10 @@ Refer to the [Deployment](https://data-safe-haven.readthedocs.io/en/latest/deplo
 ### For minor releases and above
 
 - [ ] Deploy an SHM from this branch and save a transcript of the deployment logs
-- [ ] Build an SRE compute image (SRD) and save transcripts of the logs
 - Using the new image, deploy a tier 2 and a tier 3 SRE
     - [ ] Save the transcript of your tier 2 SRE deployment
     - [ ] Save the transcript of your tier 3 SRE deployment
 - [ ] Complete the [Security evaluation checklist](https://data-safe-haven.readthedocs.io/en/latest/deployment/security_checklist.html) from the deployment documentation
-- [ ] Update [SECURITY.md](../../SECURITY.md) and [VERSIONING.md](../../VERSIONING.md)
 - [ ] Add the new versions tag as an active build on [Read The Docs](https://readthedocs.org) (You can add as a hidden build, before release, to preview)
 
 ### For major releases only

.github/dependabot.yml

@@ -7,3 +7,13 @@ updates:
     directory: "/"  # The exact logic is unclear, but it recursively searches at least .github/workflows/
     schedule:
       interval: "weekly"
+  # Python package update PRs
+  - package-ecosystem: pip  # This will update 'pyproject.toml'
+    directory: "/"
+    schedule:
+      interval: weekly
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+      development-dependencies:
+        dependency-type: "development"

.github/workflows/dependabot_amend.yaml

@@ -0,0 +1,46 @@
+---
+name: Amend Dependabot PRs
+
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches:
+      - dependabot/pip/**
+  pull_request:
+    branches:
+      - dependabot/pip/**
+  workflow_dispatch:  # allow this workflow to be manually triggered
+
+# checkout needs 'contents:read'
+# pull request needs 'pull-requests:write' and 'contents:write'
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  amend_dependabot_prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install hatch
+        run: pip install hatch
+
+      - name: Update hatch requirements
+        run: |
+          rm .hatch/requirements*.txt
+          hatch run true
+          hatch -e docs run true
+          hatch -e lint run true
+          hatch -e test run true
+
+      - name: Commit changes
+        uses: stefanzweifel/[email protected]
+        with:
+          commit_message: "[dependabot skip] :wrench: Update Python requirements files"
+          branch: ${{ github.head_ref }}

.github/workflows/lint_code.yaml

@@ -48,9 +48,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
       - name: Install requirements
         shell: bash
-        run: sudo gem install mdl
+        run: gem install mdl
       - name: Lint Markdown
         run: mdl --style .mdlstyle.rb .
 

.gitignore

@@ -15,6 +15,7 @@ environment_configs/package_lists/dependency-cache.json
 # Python build caches
 __pycache__/
 .venv/
+dist/
 
 # Development tools
 .vscode

docs/requirements.txt → .hatch/requirements-docs.txt

@@ -1,20 +1,24 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
+# This file is autogenerated by hatch-pip-compile with Python 3.12
 #
-#    pip-compile --constraint=requirements-constraints.txt --output-file=docs/requirements.txt -
+# - emoji==2.12.1
+# - myst-parser==4.0.0
+# - pydata-sphinx-theme==0.15.4
+# - sphinx-togglebutton==0.3.2
+# - sphinx==8.0.2
 #
+
 accessible-pygments==0.0.5
     # via pydata-sphinx-theme
-alabaster==0.7.16
+alabaster==1.0.0
     # via sphinx
-babel==2.15.0
+babel==2.16.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
 beautifulsoup4==4.12.3
     # via pydata-sphinx-theme
-certifi==2024.7.4
+certifi==2024.8.30
     # via requests
 charset-normalizer==3.3.2
     # via requests
@@ -25,11 +29,9 @@ docutils==0.21.2
     #   sphinx
     #   sphinx-togglebutton
 emoji==2.12.1
-    # via -r -
-idna==3.7
-    # via
-    #   -c requirements-constraints.txt
-    #   requests
+    # via hatch.envs.docs
+idna==3.8
+    # via requests
 imagesize==1.4.1
     # via sphinx
 jinja2==3.1.4
@@ -46,37 +48,35 @@ mdit-py-plugins==0.4.1
     # via myst-parser
 mdurl==0.1.2
     # via markdown-it-py
-myst-parser==3.0.1
-    # via -r -
+myst-parser==4.0.0
+    # via hatch.envs.docs
 packaging==24.1
     # via
     #   pydata-sphinx-theme
     #   sphinx
 pydata-sphinx-theme==0.15.4
-    # via -r -
+    # via hatch.envs.docs
 pygments==2.18.0
     # via
     #   accessible-pygments
     #   pydata-sphinx-theme
     #   sphinx
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via myst-parser
 requests==2.32.3
-    # via
-    #   -c requirements-constraints.txt
-    #   sphinx
+    # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
-soupsieve==2.5
+soupsieve==2.6
     # via beautifulsoup4
-sphinx==7.4.7
+sphinx==8.0.2
     # via
-    #   -r -
+    #   hatch.envs.docs
     #   myst-parser
     #   pydata-sphinx-theme
     #   sphinx-togglebutton
 sphinx-togglebutton==0.3.2
-    # via -r -
+    # via hatch.envs.docs
 sphinxcontrib-applehelp==2.0.0
     # via sphinx
 sphinxcontrib-devhelp==2.0.0
@@ -94,9 +94,7 @@ typing-extensions==4.12.2
     #   emoji
     #   pydata-sphinx-theme
 urllib3==2.2.2
-    # via
-    #   -c requirements-constraints.txt
-    #   requests
+    # via requests
 wheel==0.44.0
     # via sphinx-togglebutton