Merge pull request #1 from epics-containers/merge-skeleton

Merge latest skeleton template

Author: gilesknap

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/code.yml

@@ -45,13 +45,13 @@ jobs:
           SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) pipx run build --sdist --wheel
 
       - name: Upload Wheel and Sdist as artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist
 
       - name: Install minimum python version
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -91,7 +91,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -121,7 +121,7 @@ jobs:
 
       - name: Upload build files
         if: matrix.lock
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: buildfiles
           path: |
@@ -134,7 +134,7 @@ jobs:
     # upload to PyPI and make a release on every tag
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           path: artifacts
 
@@ -167,7 +167,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
@@ -182,7 +182,7 @@ jobs:
 
       - name: Log in to GitHub Docker Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -200,10 +200,10 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build runtime image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           file: .devcontainer/Dockerfile
           context: .

.github/workflows/docs.yml

@@ -26,7 +26,7 @@ jobs:
         run: sleep 60
 
       - name: Install python version
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 

.github/workflows/linkcheck.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install python version
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 

.gitignore

@@ -66,3 +66,4 @@ target/
 /lightweight-venv/
 /installed.files
 .venv*
+

setup.cfg

@@ -32,7 +32,7 @@ setup_requires =
 [options.extras_require]
 # For development tests/docs
 dev =
-    black==22.3.0
+    black==22.6.0
     pipdeptree
     flake8-isort
     isort>5.0

src/python3_pip_skeleton/__main__.py

@@ -87,7 +87,7 @@ def replace_text(text: str) -> str:
         # will do the wrong thing
         shutil.rmtree(git_tmp / "src", ignore_errors=True)
         # Merge in the skeleton commits
-        git_tmp("pull", SKELETON, "skeleton")
+        git_tmp("pull", SKELETON, "main")
         # Move things around
         git_tmp("mv", "src/python3_pip_skeleton", f"src/{package}")
         git_tmp("mv", "tests/test_dls_python3_skeleton.py", f"tests/test_{package}.py")