Merge pull request #4296 from pypa/feature/skeleton

Merge changes from skeleton

.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:
   workflow_dispatch:
 
@@ -39,7 +42,6 @@ jobs:
       matrix:
         python:
         - "3.8"
-        - "3.11"
         - "3.12"
         platform:
         - ubuntu-latest
@@ -50,6 +52,8 @@ jobs:
           platform: ubuntu-latest
         - python: "3.10"
           platform: ubuntu-latest
+        - python: "3.11"
+          platform: ubuntu-latest
         - python: pypy3.10
           platform: ubuntu-latest
           distutils: stdlib

.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

mypy.ini

@@ -25,7 +25,8 @@ disable_error_code = attr-defined
 #   https://github.com/pypa/setuptools/pull/3979#discussion_r1367968993
 # - distutils._modified has different errors on Python 3.8 [import-untyped], on Python 3.9+ [import-not-found]
 # - All jaraco modules are still untyped
-[mypy-pkg_resources.extern.*,setuptools.extern.*,distutils._modified,jaraco.*]
+# - _validate_project sometimes complains about trove_classifiers (#4296)
+[mypy-pkg_resources.extern.*,setuptools.extern.*,distutils._modified,jaraco.*,trove_classifiers]
 ignore_missing_imports = True
 
 # - pkg_resources tests create modules that won't exists statically before the test is run.

pytest.ini

@@ -2,9 +2,10 @@
 norecursedirs=dist build .tox .eggs
 addopts=
 	--doctest-modules
+	--import-mode importlib
 	--doctest-glob=pkg_resources/api_tests.txt
 	-r sxX
-doctest_optionflags=ALLOW_UNICODE ELLIPSIS
+consider_namespace_packages=true
 filterwarnings=
 	# Fail on warnings
 	error
@@ -84,3 +85,6 @@ filterwarnings=
 
 	# Ignore warnings about experimental features
 	ignore:..tool\.distutils.. in .pyproject\.toml. is still .experimental.*
+
+	# Ignore warnings about consider_namespace_packages (jaraco/skeleton@6ff02e0eefcd)
+	ignore:Unknown config option. consider_namespace_packages:pytest.PytestConfigWarning

ruff.toml

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

setup.cfg

@@ -42,14 +42,12 @@ exclude =
 [options.extras_require]
 testing =
 	# upstream
-	pytest >= 6
+	pytest >= 6, != 8.1.1
 	pytest-checkdocs >= 2.4
 	pytest-cov; \
 		# coverage seems to make PyPy extremely slow
 		python_implementation != "PyPy"
-	pytest-mypy >= 0.9.1; \
-		# workaround for jaraco/skeleton#22
-		python_implementation != "PyPy"
+	pytest-mypy
 	pytest-enabler >= 2.2
 	# workaround for pypa/setuptools#3921
 	pytest-ruff >= 0.2.1; sys_platform != "cygwin"
@@ -95,8 +93,6 @@ testing-integration =
 docs =
 	# upstream
 	sphinx >= 3.5
-	# workaround for sphinx/sphinx-doc#11662
-	sphinx < 7.2.5
 	jaraco.packaging >= 9.3
 	rst.linker >= 1.9
 	furo

tox.ini

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