Merge https://github.com/jaraco/skeleton

cherrypy · Sep 11, 2024 · 3f7a3c3 · 3f7a3c3
2 parents 620d8f2 + 3fe8c5b
commit 3f7a3c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,6 +10,7 @@ on:
     # required if branches-ignore is supplied (jaraco/skeleton#103)
     - '**'
   pull_request:
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -35,7 +36,7 @@ jobs:
       matrix:
         python:
         - "3.8"
-        - "3.12"
+        - "3.13"
         platform:
         - ubuntu-latest
         - macos-latest
@@ -47,10 +48,14 @@ jobs:
           platform: ubuntu-latest
         - python: "3.11"
           platform: ubuntu-latest
+        - python: "3.12"
+          platform: ubuntu-latest
+        - python: "3.14"
+          platform: ubuntu-latest
         - python: pypy3.10
           platform: ubuntu-latest
     runs-on: ${{ matrix.platform }}
-    continue-on-error: ${{ matrix.python == '3.13' }}
+    continue-on-error: ${{ matrix.python == '3.14' }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-
 extensions = [
     'sphinx.ext.autodoc',
     'jaraco.packaging.sphinx',

diff --git a/tox.ini b/tox.ini
@@ -31,9 +31,7 @@ extras =
 changedir = docs
 commands =
 	python -m sphinx -W --keep-going . {toxinidir}/build/html
-	python -m sphinxlint \
-		# workaround for sphinx-contrib/sphinx-lint#83
-		--jobs 1
+	python -m sphinxlint
 
 [testenv:finalize]
 description = assemble changelog and tag a release