Update template files (#114)

* Update template files

* Tweak test param to mitigate flaky behavior

* Remove python 3.9 references and add python 3.13

* Modernize code and upgrade lock files again

* Modify versions in tests dot yaml

* Remove unused docker compose arg

* Fix tox config

* Switch some values back to match template and hexkit's CI test matrix

* Fix accidental gh action downgrade

* Install second python version in dev container to run tox locally

Author: TheByronHimes

.devcontainer/Dockerfile

@@ -1,19 +1,29 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.9-bullseye
+FROM mcr.microsoft.com/devcontainers/python:2.0.2-3.13-trixie
 
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONUNBUFFERED=1
 
 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then groupmod --gid $USER_GID vscode && usermod --uid $USER_UID --gid $USER_GID vscode; fi
 
-# [Option] Install Node.js
-ARG INSTALL_NODE="false"
-ARG NODE_VERSION="lts/*"
-RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# Copy install and launcher script to bin:
+# Copy install script
 COPY ./dev_install /bin
-COPY ./dev_launcher /bin
+
+# Install secondary Python version
+USER vscode
+RUN <<EOF
+curl -sS https://pyenv.run | /bin/sh
+INIT_PYENV='
+export PYENV_ROOT="$HOME/.pyenv"
+[ -d "$PYENV_ROOT/bin" ] && export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+'
+echo "$INIT_PYENV" >> ~/.profile
+echo "$INIT_PYENV" >> ~/.bashrc
+. ~/.profile
+pyenv install --skip-existing 3.10
+pyenv global system 3.10
+EOF
 
 CMD ["sleep", "infinity"]

.devcontainer/dev_launcher

@@ -70,6 +70,6 @@
 	},
 	"features": {
 		// details can be found here: https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker
-		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {"moby": false}
 	}
 }

.devcontainer/devcontainer.json

@@ -6,8 +6,6 @@ services:
       context: .
       dockerfile: ./Dockerfile
       args:
-        # [Choice] Python version: 3, 3.8, 3.7, 3.6
-        VARIANT: 3.9
         # [Choice] Install Node.js
         INSTALL_NODE: "true"
         NODE_VERSION: "lts/*"

.devcontainer/docker-compose.yml

@@ -11,11 +11,13 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Common steps
         id: common
         uses: ghga-de/gh-action-common@v6
+        with:
+          python-version: '3.13'
 
       - name: Check config docs
         id: check-config-docs

.github/workflows/check_config_docs.yaml

@@ -11,11 +11,13 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Common steps
         id: common
         uses: ghga-de/gh-action-common@v6
+        with:
+          python-version: '3.13'
 
       - name: Check pyproject.toml
         id: check-pyproject

.github/workflows/check_pyproject.yaml

@@ -11,11 +11,13 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Common steps
         id: common
         uses: ghga-de/gh-action-common@v6
+        with:
+          python-version: '3.13'
 
       - name: Check README
         id: check-readme

.github/workflows/check_readme.yaml

@@ -11,13 +11,13 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: Set up Python 3.12
+      - name: Set up Python 3.13
         id: setup-python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Check template files
         id: check-template-files

.github/workflows/check_template_files.yaml

@@ -11,11 +11,13 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Common steps
         id: common
         uses: ghga-de/gh-action-common@v6
+        with:
+          python-version: '3.13'
 
       - name: Run pre-commit
         uses: pre-commit/[email protected]

.github/workflows/static_code_analysis.yaml

@@ -9,14 +9,13 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
       - name: Checkout repository
         id: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Common steps
         id: common
@@ -27,19 +26,19 @@ jobs:
       - name: Install tox plugin
         id: install-tox-gh-actions
         run: |
-          pip install --disable-pip-version-check "tox-gh-actions>=3.2,<4"
+          pip install --disable-pip-version-check "tox-gh-actions>=3.3,<4"
 
       - name: Run tests with Python ${{ matrix.python-version }}
         id: pytest
-        if: ${{ matrix.python-version != '3.12' }}
+        if: ${{ matrix.python-version != '3.13' }}
         run: |
           export ${{ steps.common.outputs.CONFIG_YAML_ENV_VAR_NAME }}="${{ steps.common.outputs.CONFIG_YAML }}"
 
           tox
 
       - name: Run tests with Python ${{ matrix.python-version }} measuring coverage
         id: pytest-coverage
-        if: ${{ matrix.python-version == '3.12' }}
+        if: ${{ matrix.python-version == '3.13' }}
         run: |
           export ${{ steps.common.outputs.CONFIG_YAML_ENV_VAR_NAME }}="${{ steps.common.outputs.CONFIG_YAML }}"
 
@@ -48,7 +47,7 @@ jobs:
 
       - name: Upload coverage to coveralls
         id: coveralls
-        if: ${{ matrix.python-version == '3.12' }}
+        if: ${{ matrix.python-version == '3.13' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |