Merge branch 'main' of https://github.com/pypa/setuptools into pyrigh…

…t-initial-config

.github/workflows/pyright.yml

@@ -21,10 +21,10 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  # pin pyright so a new version doesn't suddenly cause the CI to fail,
+  # pin pyright version so a new version doesn't suddenly cause the CI to fail,
   # until types-setuptools is removed from typeshed.
   # For help with static-typing issues, or pyright update, ping @Avasam
-  PYRIGHT_VERSION: "latest"
+  PYRIGHT_VERSION: "1.1.377"
 
   # Environment variable to support color support (jaraco/skeleton#66)
   FORCE_COLOR: 1

pyproject.toml

@@ -126,9 +126,10 @@ type = [
 	"pytest-mypy",
 
 	# local
-	# pin mypy so a new version doesn't suddenly cause the CI to fail,
+
+	# pin mypy version so a new version doesn't suddenly cause the CI to fail,
 	# until types-setuptools is removed from typeshed.
-	# For help with static-typing issues, or mypy update, ping @Avasam
+	# For help with static-typing issues, or mypy update, ping @Avasam 
 	"mypy==1.11.*",
 	# Typing fixes in version newer than we require at runtime
 	"importlib_metadata>=7.0.2; python_version < '3.10'",

setuptools/tests/integration/test_pip_install_sdist.py

@@ -202,7 +202,6 @@ def build_deps(package, sdist_file):
     "Manually" install them, since pip will not install build
     deps with `--no-build-isolation`.
     """
-
     # delay importing, since pytest discovery phase may hit this file from a
     # testenv without tomli
     from setuptools.compat.py310 import tomllib