Drop support for 3.8 and apply some formatting/skel updates.

Author: ionelmc

.cookiecutterrc

@@ -1,9 +1,6 @@
 # Generated by cookiepatcher, a small shim around cookiecutter (pip install cookiepatcher)
 
 default_context:
-    allow_tests_inside_package: 'no'
-    c_extension_function: '-'
-    c_extension_module: '-'
     c_extension_optional: 'no'
     c_extension_support: 'no'
     codacy: 'no'
@@ -17,10 +14,12 @@ default_context:
     email: contact@ionelmc.ro
     formatter_quote_style: single
     full_name: Ionel Cristian Mărieș
+    function_name: compute
     github_actions: 'yes'
     github_actions_osx: 'yes'
     github_actions_windows: 'yes'
     license: BSD 2-Clause License
+    module_name: core
     package_name: tblib
     pre_commit: 'yes'
     project_name: tblib
@@ -40,6 +39,7 @@ default_context:
     sphinx_doctest: 'no'
     sphinx_theme: sphinx-py3doc-enhanced-theme
     test_matrix_separate_coverage: 'no'
+    tests_inside_package: 'no'
     version: 3.0.0
     version_manager: bump2version
     website: https://blog.ionelmc.ro/

.github/workflows/github-actions.yml

@@ -1,5 +1,5 @@
 name: build
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 jobs:
   test:
     name: ${{ matrix.name }}
@@ -19,24 +19,6 @@ jobs:
             toxpython: 'python3.11'
             tox_env: 'docs'
             os: 'ubuntu-latest'
-          - name: 'py38 (ubuntu)'
-            python: '3.8'
-            toxpython: 'python3.8'
-            python_arch: 'x64'
-            tox_env: 'py38'
-            os: 'ubuntu-latest'
-          - name: 'py38 (windows)'
-            python: '3.8'
-            toxpython: 'python3.8'
-            python_arch: 'x64'
-            tox_env: 'py38'
-            os: 'windows-latest'
-          - name: 'py38 (macos)'
-            python: '3.8'
-            toxpython: 'python3.8'
-            python_arch: 'x64'
-            tox_env: 'py38'
-            os: 'macos-latest'
           - name: 'py39 (ubuntu)'
             python: '3.9'
             toxpython: 'python3.9'
@@ -52,7 +34,7 @@ jobs:
           - name: 'py39 (macos)'
             python: '3.9'
             toxpython: 'python3.9'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py39'
             os: 'macos-latest'
           - name: 'py310 (ubuntu)'
@@ -70,7 +52,7 @@ jobs:
           - name: 'py310 (macos)'
             python: '3.10'
             toxpython: 'python3.10'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py310'
             os: 'macos-latest'
           - name: 'py311 (ubuntu)'
@@ -88,7 +70,7 @@ jobs:
           - name: 'py311 (macos)'
             python: '3.11'
             toxpython: 'python3.11'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py311'
             os: 'macos-latest'
           - name: 'py312 (ubuntu)'
@@ -106,26 +88,26 @@ jobs:
           - name: 'py312 (macos)'
             python: '3.12'
             toxpython: 'python3.12'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'py312'
             os: 'macos-latest'
-          - name: 'pypy38 (ubuntu)'
-            python: 'pypy-3.8'
-            toxpython: 'pypy3.8'
+          - name: 'py313 (ubuntu)'
+            python: '3.13'
+            toxpython: 'python3.13'
             python_arch: 'x64'
-            tox_env: 'pypy38'
+            tox_env: 'py313'
             os: 'ubuntu-latest'
-          - name: 'pypy38 (windows)'
-            python: 'pypy-3.8'
-            toxpython: 'pypy3.8'
+          - name: 'py313 (windows)'
+            python: '3.13'
+            toxpython: 'python3.13'
             python_arch: 'x64'
-            tox_env: 'pypy38'
+            tox_env: 'py313'
             os: 'windows-latest'
-          - name: 'pypy38 (macos)'
-            python: 'pypy-3.8'
-            toxpython: 'pypy3.8'
-            python_arch: 'x64'
-            tox_env: 'pypy38'
+          - name: 'py313 (macos)'
+            python: '3.13'
+            toxpython: 'python3.13'
+            python_arch: 'arm64'
+            tox_env: 'py313'
             os: 'macos-latest'
           - name: 'pypy39 (ubuntu)'
             python: 'pypy-3.9'
@@ -142,7 +124,7 @@ jobs:
           - name: 'pypy39 (macos)'
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy39'
             os: 'macos-latest'
           - name: 'pypy310 (ubuntu)'
@@ -160,14 +142,14 @@ jobs:
           - name: 'pypy310 (macos)'
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
-            python_arch: 'x64'
+            python_arch: 'arm64'
             tox_env: 'pypy310'
             os: 'macos-latest'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.python_arch }}
@@ -183,3 +165,11 @@ jobs:
         TOXPYTHON: '${{ matrix.toxpython }}'
       run: >
         tox -e ${{ matrix.tox_env }} -v
+  finish:
+    needs: test
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: codecov/codecov-action@v3
+      with:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.pre-commit-config.yaml

@@ -2,20 +2,17 @@
 #   pre-commit install --install-hooks
 # To update the versions:
 #   pre-commit autoupdate
-exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg|tests/bad.*.py)(/|$)'
+exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg|tests/badsyntax.py)(/|$)'
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.1
+    rev: v0.11.2
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix, --show-fixes]
-  - repo: https://github.com/psf/black
-    rev: 23.10.0
-    hooks:
-      - id: black
+        args: [--fix, --exit-non-zero-on-fix, --show-fixes, --unsafe-fixes]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

README.rst

@@ -10,13 +10,11 @@ Overview
     * - docs
       - |docs|
     * - tests
-      - | |github-actions|
-        | |codecov|
+      - |github-actions| |codecov|
     * - package
-      - | |version| |wheel| |supported-versions| |supported-implementations|
-        | |commits-since|
+      - |version| |wheel| |supported-versions| |supported-implementations| |commits-since|
 .. |docs| image:: https://readthedocs.org/projects/python-tblib/badge/?style=flat
-    :target: https://python-tblib.readthedocs.io/
+    :target: https://readthedocs.org/projects/python-tblib/
     :alt: Documentation Status
 
 .. |github-actions| image:: https://github.com/ionelmc/python-tblib/actions/workflows/github-actions.yml/badge.svg

ci/templates/.github/workflows/github-actions.yml

@@ -1,5 +1,5 @@
 name: build
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 jobs:
   test:
     name: {{ '${{ matrix.name }}' }}
@@ -33,7 +33,7 @@ jobs:
 {% for os, python_arch in [
     ['ubuntu', 'x64'],
     ['windows', 'x64'],
-    ['macos', 'x64'],
+    ['macos', 'arm64'],
 ] %}
           - name: '{{ env }} ({{ os }})'
             python: '{{ python }}'
@@ -44,10 +44,10 @@ jobs:
 {% endfor %}
 {% endfor %}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: {{ '${{ matrix.python }}' }}
         architecture: {{ '${{ matrix.python_arch }}' }}
@@ -63,3 +63,11 @@ jobs:
         TOXPYTHON: '{{ '${{ matrix.toxpython }}' }}'
       run: >
         tox -e {{ '${{ matrix.tox_env }}' }} -v
+  finish:
+    needs: test
+    if: {{ '${{ always() }}' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: codecov/codecov-action@v3
+      with:
+        CODECOV_TOKEN: {% raw %}${{ secrets.CODECOV_TOKEN }}{% endraw %}

docs/conf.py

@@ -1,7 +1,6 @@
-import sphinx_py3doc_enhanced_theme
-
 extensions = [
-    'autoapi.extension',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
     'sphinx.ext.coverage',
     'sphinx.ext.doctest',
     'sphinx.ext.extlinks',
@@ -10,35 +9,29 @@
     'sphinx.ext.todo',
     'sphinx.ext.viewcode',
 ]
-autoapi_type = 'python'
-autoapi_dirs = ['../src']
-
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'tblib'
-year = '2013-2022'
+year = '2013-2023'
 author = 'Ionel Cristian Mărieș'
 copyright = f'{year}, {author}'
 version = release = '3.0.0'
 
 pygments_style = 'trac'
 templates_path = ['.']
 extlinks = {
-    'issue': ('https://github.com/ionelmc/python-tblib/issues/%s', '#'),
-    'pr': ('https://github.com/ionelmc/python-tblib/pull/%s', 'PR #'),
+    'issue': ('https://github.com/ionelmc/python-tblib/issues/%s', '#%s'),
+    'pr': ('https://github.com/ionelmc/python-tblib/pull/%s', 'PR #%s'),
 }
+
 html_theme = 'sphinx_py3doc_enhanced_theme'
-html_theme_path = [sphinx_py3doc_enhanced_theme.get_html_theme_path()]
 html_theme_options = {
     'githuburl': 'https://github.com/ionelmc/python-tblib/',
 }
 
 html_use_smartypants = True
 html_last_updated_fmt = '%b %d, %Y'
 html_split_index = False
-html_sidebars = {
-    '**': ['searchbox.html', 'globaltoc.html', 'sourcelink.html'],
-}
 html_short_title = f'{project}-{version}'
 
 napoleon_use_ivar = True

pyproject.toml

@@ -1,21 +1,26 @@
 [build-system]
 requires = [
-    "setuptools>=30.3.0",
+    "setuptools>=40.1.0",
 ]
 
-[tool.ruff.per-file-ignores]
-"ci/*" = ["S"]
-
 [tool.ruff]
 extend-exclude = ["static", "ci/templates"]
+line-length = 140
+src = ["src", "tests"]
+target-version = "py39"
+
+[tool.ruff.lint.per-file-ignores]
+"ci/*" = ["S"]
+
+[tool.ruff.lint]
 ignore = [
     "RUF001", # ruff-specific rules ambiguous-unicode-character-string
     "S101", # flake8-bandit assert
-    "S301", # flake8-bandit pickle
     "S308", # flake8-bandit suspicious-mark-safe-usage
+    "S603", # flake8-bandit subprocess-without-shell-equals-true
+    "S607", # flake8-bandit start-process-with-partial-path
     "E501", # pycodestyle line-too-long
 ]
-line-length = 140
 select = [
     "B", # flake8-bugbear
     "C4", # flake8-comprehensions
@@ -30,28 +35,20 @@ select = [
     "PLE", # pylint errors
     "PT", # flake8-pytest-style
     "PTH", # flake8-use-pathlib
-    "Q", # flake8-quotes
     "RSE", # flake8-raise
     "RUF", # ruff-specific rules
     "S", # flake8-bandit
     "UP", # pyupgrade
     "W", # pycodestyle warnings
 ]
-src = ["src", "tests"]
-target-version = "py38"
 
-[tool.ruff.flake8-pytest-style]
+[tool.ruff.lint.flake8-pytest-style]
 fixture-parentheses = false
 mark-parentheses = false
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 forced-separate = ["conftest"]
 force-single-line = true
 
-[tool.black]
-line-length = 140
-target-version = ["py38"]
-skip-string-normalization = true
-
-[tool.ruff.flake8-quotes]
-inline-quotes = "single"
+[tool.ruff.format]
+quote-style = "single"