final review changes

Author: gilesknap

.github/workflows/code.yml

@@ -77,13 +77,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-buildx-
-
       - name: Log in to GitHub Docker Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
@@ -111,8 +104,6 @@ jobs:
           tags: build:latest
           context: .
           target: build
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
           load: true
 
       - name: Run tests in the container locked with requirements_dev.txt
@@ -136,8 +127,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           context: .
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Upload build files
         uses: actions/upload-artifact@v3
@@ -177,8 +166,8 @@ jobs:
         uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
         with:
           files: |
-            build_files/requirements*
-            build_files/dist
+            build_files/*
+            build_files/dist/*
           generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docs.yml

@@ -44,7 +44,7 @@ jobs:
         run: tox -e docs
 
       - name: Move to versioned directory
-        # e.g. master or 0.1.2
+        # e.g. main or 0.1.2
         run: mv build/html ".github/pages/${GITHUB_REF##*/}"
 
       - name: Write versions.txt

.github/workflows/linkcheck.yml

@@ -16,10 +16,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Avoid git conflicts when tag and branch pushed at same time
-        if: startsWith(github.ref, 'refs/tags')
-        run: sleep 60
-
       - name: Checkout
         uses: actions/checkout@v2
         with:

.gitignore

@@ -60,10 +60,8 @@ docs/_build/
 # PyBuilder
 target/
 
-# DLS build dir and virtual environment
-/prefix/
-/venv/
-/lightweight-venv/
-/installed.files
+# likely venv names
 .venv*
+venv*
+
 

.gitremotes

@@ -5,8 +5,8 @@
     "tasks": [
         {
             "type": "shell",
-            "label": "Tests with coverage",
-            "command": "tox -e pytest",
+            "label": "Tests, lint and docs",
+            "command": "tox -p",
             "options": {
                 "cwd": "${workspaceRoot}"
             },

.vscode/tasks.json

@@ -9,8 +9,6 @@ python3-pip-skeleton
     adopt this skeleton project see 
     https://epics-containers.github.io/python3-pip-skeleton-cli
 
-    [Remove this note when adopting skeleton.]
-
 This is where you should write a short paragraph that describes what your module does,
 how it does it, and why people should use it.
 

README.rst

@@ -24,11 +24,6 @@ def assert_not_contains_text(path: str, text: str, explanation: str):
         skeleton_check(text in contents, f"Please change ./{path} {explanation}")
 
 
-def assert_not_exists(path: str, explanation: str):
-    exists = (ROOT / path).exists()
-    skeleton_check(exists, f"Please delete ./{path} {explanation}")
-
-
 # setup.cfg
 def test_module_description():
     conf = configparser.ConfigParser()
@@ -50,6 +45,14 @@ def test_changed_README_intro():
     )
 
 
+def test_removed_adopt_skeleton():
+    assert_not_contains_text(
+        "README.rst",
+        "This project contains template code only",
+        "remove the note at the start",
+    )
+
+
 def test_changed_README_body():
     assert_not_contains_text(
         "README.rst",