Merge pull request #4211 from pypa/debt/sync-skeleton

jaraco · web-flow · commit 73153754d0eb · 2024-02-08T12:40:56.000-05:00
Merge latest skeleton
diff --git a/.coveragerc b/.coveragerc
@@ -10,3 +10,7 @@ disable_warnings =
 
 [report]
 show_missing = True
+exclude_also =
+	# jaraco/skeleton#97
+	@overload
+	if TYPE_CHECKING:
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -7,6 +7,6 @@ python:
 
 # required boilerplate readthedocs/readthedocs.org#10401
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
-    python: "3"
+    python: latest
diff --git a/README.rst b/README.rst
@@ -14,7 +14,7 @@
 .. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
     :target: https://setuptools.pypa.io
 
-.. image:: https://img.shields.io/badge/skeleton-2023-informational
+.. image:: https://img.shields.io/badge/skeleton-2024-informational
    :target: https://blog.jaraco.com/skeleton
 
 .. image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white
diff --git a/ruff.toml b/ruff.toml
@@ -38,5 +38,7 @@ exclude = [
 	"setuptools/_distutils",
 	"setuptools/config/_validate_pyproject",
 ]
+# Enable preview, required for quote-style = "preserve"
+preview = true
 # https://docs.astral.sh/ruff/settings/#format-quote-style
 quote-style = "preserve"
diff --git a/setup.cfg b/setup.cfg
@@ -30,10 +30,6 @@ install_requires =
 
 [options.packages.find]
 exclude =
-	build*
-	dist*
-	docs*
-	tests*
 	*.tests
 	*.tests.*
 	tools*
diff --git a/setuptools/depends.py b/setuptools/depends.py
@@ -161,6 +161,7 @@ def extract_constant(code, symbol, default=-1):
 
     return None
 
+
 def _update_globals():
     """
     Patch the globals to remove the objects not available on some platforms.
diff --git a/setuptools/py311compat.py b/setuptools/py311compat.py
@@ -1,6 +1,9 @@
 import sys
 
 
+__all__ = ['tomllib']
+
+
 if sys.version_info >= (3, 11):
     import tomllib
 else:  # pragma: no cover
diff --git a/setuptools/tests/integration/helpers.py b/setuptools/tests/integration/helpers.py
@@ -16,7 +16,7 @@ def run(cmd, env=None):
     r = subprocess.run(
         cmd,
         capture_output=True,
-        universal_newlines=True,
+        text=True,
         env={**os.environ, **(env or {})},
         # ^-- allow overwriting instead of discarding the current env
     )
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
@@ -1,5 +1,4 @@
-"""Basic http server for tests to simulate PyPI or custom indexes
-"""
+"""Basic http server for tests to simulate PyPI or custom indexes"""
 
 import os
 import time
diff --git a/setuptools/tests/test_bdist_deprecations.py b/setuptools/tests/test_bdist_deprecations.py
@@ -1,5 +1,4 @@
-"""develop tests
-"""
+"""develop tests"""
 
 import sys
 from unittest import mock
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
@@ -1,5 +1,4 @@
-"""develop tests
-"""
+"""develop tests"""
 
 import os
 import re
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
@@ -1,5 +1,4 @@
-"""develop tests
-"""
+"""develop tests"""
 
 import os
 import sys
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
@@ -1,5 +1,4 @@
-"""Test .dist-info style distributions.
-"""
+"""Test .dist-info style distributions."""
 
 import pathlib
 import re
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
@@ -1,5 +1,4 @@
-"""Easy install Tests
-"""
+"""Easy install Tests"""
 
 import sys
 import os
diff --git a/setuptools/tests/test_install_scripts.py b/setuptools/tests/test_install_scripts.py
@@ -1,5 +1,4 @@
-"""install_scripts tests
-"""
+"""install_scripts tests"""
 
 import sys
 
diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
@@ -1,4 +1,3 @@
-import sys
 import distutils.errors
 import urllib.request
 import urllib.error
diff --git a/setuptools/tests/test_sandbox.py b/setuptools/tests/test_sandbox.py
@@ -1,5 +1,4 @@
-"""develop tests
-"""
+"""develop tests"""
 
 import os
 import types
diff --git a/setuptools/tests/test_wheel.py b/setuptools/tests/test_wheel.py
@@ -1,5 +1,4 @@
-"""wheel tests
-"""
+"""wheel tests"""
 
 from distutils.sysconfig import get_config_var
 from distutils.util import get_platform

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,7 @@ exclude = [`
`38`	`38`	`"setuptools/_distutils",`
`39`	`39`	`"setuptools/config/_validate_pyproject",`
`40`	`40`	`]`
	`41`	`+# Enable preview, required for quote-style = "preserve"`
	`42`	`+preview = true`
`41`	`43`	`# https://docs.astral.sh/ruff/settings/#format-quote-style`
`42`	`44`	`quote-style = "preserve"`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def run(cmd, env=None):`
`16`	`16`	`r = subprocess.run(`
`17`	`17`	`cmd,`
`18`	`18`	`capture_output=True,`
`19`		`- universal_newlines=True,`
	`19`	`+ text=True,`
`20`	`20`	`env={os.environ, (env or {})},`
`21`	`21`	`# ^-- allow overwriting instead of discarding the current env`
`22`	`22`	`)`