Upgraded project and dependencies (#42)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: francis-clairicia

.flake8

@@ -31,16 +31,11 @@ per-file-ignores =
     # F405: 'name' may be undefined, or defined from star imports: 'module'
     src/pydiamond/__init__.py:F401
     src/pydiamond/*/__init__.py:F401,F403,F405
+    .github/*.py:DALL001
+    tests/*.py:DALL001
     #### Stub errors ignore ####
     # E301,E302: expected 1/2 blank line(s)
     # E701: multiple statements on one line
     # F821: undefined name (useless for stub files)
     src/pydiamond/__init__.pyi:F401
     *.pyi:E301,E302,E701,F821
-
-
-[flake8:local-plugins]
-extension =
-    DAL = flake8_extensions.dunder_all:DunderAll
-paths =
-    ./devtools/linting

.github/actions/pdm.conf

@@ -0,0 +1,6 @@
+# This file is loaded in runner environment by:
+# - setup-tox
+
+PDM_VERSION=2.22.3
+PDM_CHECK_UPDATE=False
+WORKFLOW_CACHE_KEY_FILE=.github/.workflow.cache.key

.github/actions/setup-tox/action.yml

@@ -1,26 +1,58 @@
 name: 'Setup tox'
 description: 'Install tox and restore cache'
-outputs:
-  cache-hit:
-    description: 'A boolean value to indicate an exact match was found.'
-    value: ${{ steps.cache.outputs.cache-hit }}
+inputs:
+  python-version:
+    description: "Version range or exact version of Python or PyPy to use, using SemVer's version range syntax."
+    required: false
+    default: '3.x'
 
 runs:
   using: 'composite'
   steps:
-    - name: Compile requirements
-      run: python -m devtools --no-venv repo --no-sync
+    - name: Load PDM configuration from pdm.conf
+      uses: cardinalby/export-env-action@v2
+      with:
+        envFile: .github/actions/pdm.conf
+    - name: Create cache key from workflow
+      run: |
+        echo "Runner=${{ runner.os }}-${{ runner.arch }}; Workflow=${{ github.workflow }}/${{ github.job }}" > $WORKFLOW_CACHE_KEY_FILE
+        echo "Workflow Cache Version: $CACHE_CONFIGURATION_VERSION" >> $WORKFLOW_CACHE_KEY_FILE
+      env:
+        # Increment the version each time the uploaded cache must be invalidated
+        # because the data stored have changed.
+        # - 1.0: Initial
+        CACHE_CONFIGURATION_VERSION: '1.0'
+      shell: bash
+    - name: Show cache key
+      run: cat ${{ env.WORKFLOW_CACHE_KEY_FILE }}
       shell: bash
+    - name: Install PDM
+      uses: pdm-project/[email protected]
+      id: pdm
+      with:
+        version: ${{ env.PDM_VERSION }}
+        python-version: ${{ inputs.python-version }}
+        cache: true
+        cache-restore-exact-match: true
+        cache-dependency-path: |
+          ./pdm.lock
+          ${{ env.WORKFLOW_CACHE_KEY_FILE }}
     - name: Install dependencies
-      run: pip install tox -c requirements-dev.txt
+      run: |
+        pdm install --verbose --frozen-lockfile --global --project=. --no-self --no-default --dev --group=tox
+        tox --version
+        ls -lA
+      env:
+        PDM_USE_VENV: False
       shell: bash
-    - name: Get python info
-      id: python
-      run: echo "checksum=$(python -VV | (sha256sum || shasum -a 256) | awk '{ print $1 }')" >> $GITHUB_OUTPUT
+    - name: Disable tox parallel spinner by default
+      run: echo "TOX_PARALLEL_NO_SPINNER=1" >> $GITHUB_ENV
       shell: bash
-    - name: Restore tox environment
-      id: cache
-      uses: actions/cache@v3
+    - name: Cache .tox
+      uses: actions/cache@v4
       with:
+        key: tox-${{ runner.os }}-${{ runner.arch }}-python-${{ env.PYTHON_VERSION }}-${{ env.KEY_HASH }}
         path: .tox
-        key: tox|${{ runner.os }}|${{ github.workflow }}|${{ github.job }}|${{ steps.python.outputs.checksum }}|${{ hashFiles( 'tox.ini' , 'requirements*.txt') }}
+      env:
+        PYTHON_VERSION: ${{ steps.pdm.outputs.python-version }}
+        KEY_HASH: ${{ hashFiles('./pdm.lock', './tox.ini', env.WORKFLOW_CACHE_KEY_FILE ) }}

.github/scripts/rewrite_bumpversion_cfg.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: Utf-8 -*-
 
 from __future__ import annotations
 
@@ -26,13 +25,13 @@ def rewrite_bumpversion_cfg(filepath: str, *, dry_run: bool = False) -> None:
 
     major, minor = map(str, version_match.group("major", "minor"))
 
-    config.set("bumpversion", "parse", r"{major}\.{minor}\.(?P<patch>\d+)".format(major=major, minor=minor))
+    config.set("bumpversion", "parse", fr"{major}\.{minor}\.(?P<patch>\d+)")
     config.set("bumpversion", "serialize", f"{major}.{minor}.{{patch}}")
 
     for section in filter(BUMPVERSION_PART_SECTION_PATTERN.match, config.sections()):
         config.remove_section(section)
 
-    with (open(filepath, "wt") if not dry_run else nullcontext(sys.stdout)) as output:  # type: ignore[attr-defined]
+    with (open(filepath, "w") if not dry_run else nullcontext(sys.stdout)) as output:
         config.write(output)
 
 

.github/workflows/build.yml

@@ -66,24 +66,15 @@ concurrency:
 jobs:
   build:
     if: github.event_name != 'push' || !startsWith(github.event.head_commit.message, 'Bump version:')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       SOURCE_DATE_EPOCH: ${{ inputs.SOURCE_DATE_EPOCH }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
       - name: Setup tox
         uses: ./.github/actions/setup-tox
-      - name: Check source distribution consistency
-        if: github.event_name != 'workflow_call'
-        run: tox run -e check-build-sdist
-      - name: Post-check cleanup
-        if: always()
-        run: rm -rf .tox/check-build-sdist
+        with:
+          python-version: '3.13'
       - name: Compute SOURCE_DATE_EPOCH from commit date
         if: env.SOURCE_DATE_EPOCH == ''
         run: |

.github/workflows/lint.yml

@@ -42,17 +42,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
+        os: [ubuntu-24.04, windows-2022, macos-14]
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions/setup-python@v5
-        id: setup-python
-        with:
-          python-version: '3.10'
       - name: Setup tox
         uses: ./.github/actions/setup-tox
+        with:
+          python-version: '3.13'
       - name: Launch checks
-        run: tox run -e mypy
+        run: tox run -f mypy

.github/workflows/test.yml

@@ -46,19 +46,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
-        python_version: ['3.10']
+        os: [ubuntu-24.04, windows-2022, macos-14]
+        python_version: ['3.13']
+        include:
+          - python_version: '3.13'
+            tox_py: py313
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Python ${{ matrix.python_version }}
-        id: setup-python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python_version }}
       - name: Setup tox
         uses: ./.github/actions/setup-tox
+        with:
+          python-version: ${{ matrix.python_version }}
       - name: Launch tests
-        run: tox run -f py$(echo ${{ matrix.python_version }} | tr -d .)
+        timeout-minutes: 20
+        run: tox run -f ${{ matrix.tox_py }}

.gitignore

@@ -2,14 +2,18 @@
 .vscode/*
 !.vscode/settings.example.json
 
-# Compiled requirements
-requirements*.txt
+# Github Actions
+.github/.*.key
+.github/requirements*.txt
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
 
+# pdm
+.pdm-python
+
 # C extensions
 *.so
 

.gitmodules

@@ -1,61 +1,51 @@
 default_language_version:
-  python: python3.10
+  python: python3.13
 minimum_pre_commit_version: '2.20.0'
 
 ci:
-  skip: [mypy]
-  submodules: true
   autoupdate_schedule: 'quarterly'
 
 repos:
-  - repo: local
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.1
     hooks:
-      - id: mypy
-        name: mypy (project + examples)
-        entry: tox run -q -e mypy -- src demo.py
-        language: system
-        files: ^(src/|demo\.py)
-        types_or: [python, pyi]
-        require_serial: true
-        pass_filenames: false
-      - id: mypy
-        name: mypy (tests)
-        files: ^((src|tests)/)
-        entry: tox run -q -e mypy -- tests
-        language: system
-        types_or: [python, pyi]
-        require_serial: true
-        pass_filenames: false
+      - id: pyupgrade
+        args: ['--py313-plus']
   - repo: https://github.com/PyCQA/isort
-    rev: '6.0.0'  # Keep in sync with requirements-dev.txt
+    rev: '6.0.0'
     hooks:
       - id: isort
         exclude: ^(devtools|demo_resources|\.github)/
         args: ['--filter-files', '--settings-file', 'pyproject.toml']
   - repo: https://github.com/psf/black
-    rev: '25.1.0'  # Keep in sync with requirements-dev.txt
+    rev: '25.1.0'
     hooks:
       - id: black
         exclude: ^(devtools|demo_resources|\.github)/
         args: ['--config', 'pyproject.toml']
   - repo: https://github.com/PyCQA/flake8
-    rev: '7.1.1'  # Keep in sync with requirements-dev.txt
+    rev: '7.1.1'
     hooks:
       - id: flake8
         exclude: ^(devtools|demo_resources|\.github)/
         args: ['--config', '.flake8']
         types: []  # Overwrite with empty in order to fallback to types_or
         types_or: [python, pyi]
-        additional_dependencies: [  # keep in sync with requirements/requirement-dev.in
+        additional_dependencies: [
           flake8-pyi>=22.11.0,
+          'git+https://github.com/francis-clairicia/[email protected]',
         ]
   - repo: https://github.com/aio-libs/sort-all
     rev: 'v1.3.0'
     hooks:
       - id: sort-all
-        exclude: ^(devtools|demo_resources|\.github)/
+        exclude: ^(demo_resources|\.github)/
         types: []  # Overwrite with empty in order to fallback to types_or
         types_or: [python, pyi]
+  - repo: https://github.com/pdm-project/pdm
+    rev: '2.22.3'
+    hooks:
+      - id: pdm-lock-check
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: 'v5.0.0'
     hooks: