From 48a0497b2310e8e4bcb81c72aed7517b2a3a3bfd Mon Sep 17 00:00:00 2001
From: Avasam <samuel.06@hotmail.com>
Date: Wed, 14 Feb 2024 13:58:21 -0500
Subject: [PATCH] Bump setuptools to 69.1.* (#11423)

---
 stubs/setuptools/@tests/stubtest_allowlist.txt     | 14 --------------
 stubs/setuptools/METADATA.toml                     |  3 ++-
 stubs/setuptools/setuptools/command/test.pyi       |  2 +-
 stubs/setuptools/setuptools/compat/__init__.pyi    |  0
 stubs/setuptools/setuptools/compat/py310.pyi       |  9 +++++++++
 .../{py312compat.pyi => compat/py311.pyi}          |  2 +-
 6 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 stubs/setuptools/setuptools/compat/__init__.pyi
 create mode 100644 stubs/setuptools/setuptools/compat/py310.pyi
 rename stubs/setuptools/setuptools/{py312compat.pyi => compat/py311.pyi} (69%)

diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt
index 0acd265e8..9edb8ef70 100644
--- a/stubs/setuptools/@tests/stubtest_allowlist.txt
+++ b/stubs/setuptools/@tests/stubtest_allowlist.txt
@@ -1,17 +1,3 @@
-# These are used like protocols, but forgot to specify "self" as the first method param
-pkg_resources.IResourceProvider.get_resource_filename
-pkg_resources.IResourceProvider.get_resource_stream
-pkg_resources.IResourceProvider.get_resource_string
-pkg_resources.IResourceProvider.has_resource
-pkg_resources.IResourceProvider.resource_isdir
-pkg_resources.IResourceProvider.resource_listdir
-pkg_resources.IMetadataProvider.get_metadata
-pkg_resources.IMetadataProvider.get_metadata_lines
-pkg_resources.IMetadataProvider.has_metadata
-pkg_resources.IMetadataProvider.metadata_isdir
-pkg_resources.IMetadataProvider.metadata_listdir
-pkg_resources.IMetadataProvider.run_script
-
 # Is always set in __init__
 pkg_resources.PathMetadata.egg_info
 pkg_resources.EggMetadata.loader
diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml
index a47fec19f..a203eb119 100644
--- a/stubs/setuptools/METADATA.toml
+++ b/stubs/setuptools/METADATA.toml
@@ -1,6 +1,7 @@
-version = "69.0.*"
+version = "69.1.*"
 upstream_repository = "https://github.com/pypa/setuptools"
 
 [tool.stubtest]
 # darwin is equivalent to linux for OS-specific methods
 platforms = ["linux", "win32"]
+stubtest_requirements = ["tomli"]
diff --git a/stubs/setuptools/setuptools/command/test.pyi b/stubs/setuptools/setuptools/command/test.pyi
index 1764926f9..c475e1d09 100644
--- a/stubs/setuptools/setuptools/command/test.pyi
+++ b/stubs/setuptools/setuptools/command/test.pyi
@@ -33,7 +33,7 @@ class test(Command):
     @NonDataProperty
     def test_args(self) -> list[str]: ...
     def with_project_on_sys_path(self, func) -> None: ...
-    def project_on_sys_path(self, include_dists=[]): ...
+    def project_on_sys_path(self, include_dists=()): ...
     @staticmethod
     def paths_on_pythonpath(paths) -> None: ...
     @staticmethod
diff --git a/stubs/setuptools/setuptools/compat/__init__.pyi b/stubs/setuptools/setuptools/compat/__init__.pyi
new file mode 100644
index 000000000..e69de29bb
diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi
new file mode 100644
index 000000000..9e27329c7
--- /dev/null
+++ b/stubs/setuptools/setuptools/compat/py310.pyi
@@ -0,0 +1,9 @@
+import sys
+
+__all__ = ["tomllib"]
+
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    # This is actually vendored
+    import tomli as tomllib  # type: ignore[import-not-found] # pyright: ignore[reportMissingImports]
diff --git a/stubs/setuptools/setuptools/py312compat.pyi b/stubs/setuptools/setuptools/compat/py311.pyi
similarity index 69%
rename from stubs/setuptools/setuptools/py312compat.pyi
rename to stubs/setuptools/setuptools/compat/py311.pyi
index 898cfa8f5..961f2dbdb 100644
--- a/stubs/setuptools/setuptools/py312compat.pyi
+++ b/stubs/setuptools/setuptools/compat/py311.pyi
@@ -1,3 +1,3 @@
 from _typeshed import Incomplete, StrOrBytesPath
 
-def shutil_rmtree(path: StrOrBytesPath, ignore_errors: bool = False, onexc: Incomplete | None = None) -> None: ...
+def shutil_rmtree(path: StrOrBytesPath, ignore_errors: bool = False, onexc: Incomplete | None = None): ...