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

# Conflicts:
#	pyproject.toml

.github/workflows/main.yml

@@ -4,8 +4,11 @@ on:
   merge_group:
   push:
     branches-ignore:
-    # disabled for jaraco/skeleton#103
-    # - gh-readonly-queue/**  # Temporary merge queue-related GH-made branches
+    # temporary GH branches relating to merge queues (jaraco/skeleton#93)
+    - gh-readonly-queue/**
+    tags:
+    # required if branches-ignore is supplied (jaraco/skeleton#103)
+    - '**'
   pull_request:
 
 permissions:
@@ -28,10 +31,10 @@ env:
 jobs:
   test:
     strategy:
+      # https://blog.jaraco.com/efficient-use-of-ci-resources/
       matrix:
         python:
         - "3.8"
-        - "3.11"
         - "3.12"
         platform:
         - ubuntu-latest
@@ -42,10 +45,12 @@ jobs:
           platform: ubuntu-latest
         - python: "3.10"
           platform: ubuntu-latest
+        - python: "3.11"
+          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.13' || (matrix.python == '3.8' || matrix.python == '3.9') && matrix.platform == 'macos-latest' }}
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python

.readthedocs.yaml

@@ -10,3 +10,7 @@ build:
   os: ubuntu-lts-latest
   tools:
     python: latest
+  # post-checkout job to ensure the clone isn't shallow jaraco/skeleton#114
+  jobs:
+    post_checkout:
+    - git fetch --unshallow || true

pyproject.toml

@@ -29,10 +29,10 @@ Homepage = "https://github.com/cherrypy/cherrypy-cors"
 [project.optional-dependencies]
 testing = [
 	# upstream
-	"pytest >= 6",
+	"pytest >= 6, != 8.1.*",
 	"pytest-checkdocs >= 2.4",
 	"pytest-cov",
-	'pytest-mypy; python_implementation != "PyPy"', # workaround for jaraco/skeleton#22
+	"pytest-mypy",
 	"pytest-enabler >= 2.2",
 	"pytest-ruff >= 0.2.1",
 
@@ -42,8 +42,6 @@ testing = [
 docs = [
 	# upstream
 	"sphinx >= 3.5",
-	# workaround for sphinx/sphinx-doc#11662
-	"sphinx < 7.2.5",
 	"jaraco.packaging >= 9.3",
 	"rst.linker >= 1.9",
 	"furo",

pytest.ini

@@ -1,6 +1,9 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules
+addopts=
+	--doctest-modules
+	--import-mode importlib
+consider_namespace_packages=true
 filterwarnings=
 	## upstream
 

ruff.toml

@@ -1,4 +1,8 @@
 [lint]
+extend-select = [
+	"C901",
+	"W",
+]
 ignore = [
 	# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
 	"W191",

tox.ini

@@ -12,6 +12,7 @@ extras =
 [testenv:diffcov]
 description = run tests and check that diff from main is covered
 deps =
+	{[testenv]deps}
 	diff-cover
 commands =
 	pytest {posargs} --cov-report xml