Fix CI failures

- Switch to (up/down)load-artifact@v4 as v3 is now fully deprecated
- Ensure all of the build artifacts have unique names as v4 doesn't support multiple artifacts with the same name
- Drop Python 3.7 from the CI matrix as v4 doesn't support it
- Fix a couple of docstrings to resolve linting check failure

Author: T-Nicholls

.github/actions/install_requirements/action.yml

@@ -36,9 +36,9 @@ runs:
       shell: bash
 
     - name: Upload lockfiles
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: lockfiles
+        name: lockfiles_${{ github.job }}_${{ matrix.python }}
         path: lockfiles
 
     # This eliminates the class of problems where the requirements being given no

.github/workflows/code.yml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python: ["3.7", "3.9", "3.10"]
+        python: ["3.9", "3.10"]
         install: ["-e .[dev]"]
         # Make one version be non-editable to test both paths of version code
         include:
@@ -88,9 +88,9 @@ jobs:
           pipx run build
 
       - name: Upload sdist and wheel as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist_${{ github.job }}_${{ matrix.python }}
           path: dist
 
       - name: Check for packaging errors
@@ -124,7 +124,7 @@ jobs:
         run: echo IMAGE_REPOSITORY=ghcr.io/$(tr '[:upper:]' '[:lower:]' <<< "${{ github.repository }}") >> $GITHUB_ENV
 
       - name: Download wheel and lockfiles
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts/
 
@@ -153,7 +153,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           build-args: |
-            PIP_OPTIONS=-r lockfiles/requirements.txt dist/*.whl
+            PIP_OPTIONS=-r lockfiles_dist_/requirements.txt dist_dist_/*.whl
           push: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }}
           load: ${{ ! (github.event_name == 'push' && startsWith(github.ref, 'refs/tags')) }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -177,11 +177,11 @@ jobs:
       HAS_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN != '' }}
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
 
       - name: Fixup blank lockfiles
         # Github release artifacts can't be blank
-        run: for f in lockfiles/*; do [ -s $f ] || echo '# No requirements' >> $f; done
+        run: for f in lockfiles_dist_/*; do [ -s $f ] || echo '# No requirements' >> $f; done
 
       - name: Github Release
         # We pin to the SHA, not the tag, for security reasons.
@@ -190,8 +190,8 @@ jobs:
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: |
-            dist/*
-            lockfiles/*
+            dist_dist_/*
+            lockfiles_dist_/*
           generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/pytac/lattice.py

@@ -1,5 +1,5 @@
 """Representation of a lattice object which contains all the elements of the
-    machine.
+machine.
 """
 
 import logging

tests/test_machine.py

@@ -1,6 +1,6 @@
-""" This file tests the entire loading of the DLS machine from the CSV
-    files in the data directory. These are more like integration tests,
-    and allows us to check that the pytac setup is working correctly.
+"""This file tests the entire loading of the DLS machine from the CSV
+files in the data directory. These are more like integration tests,
+and allows us to check that the pytac setup is working correctly.
 """
 
 import re