Merge branch 'setuptools-simple-typeshed-params' of https://github.com/Avasam/setuptools into setuptools-simple-typeshed-params

Author: Avasam

mypy.ini

@@ -53,16 +53,20 @@ disable_error_code = import-not-found
 #     - support for `SETUPTOOLS_USE_DISTUTILS=stdlib` is dropped (#3625)
 #       for setuptools to import `_distutils` directly
 #     - or non-stdlib distutils typings are exposed
+[mypy-distutils.*]
+ignore_missing_imports = True
+
+#  - wheel: does not intend on exposing a programmatic API https://github.com/pypa/wheel/pull/610#issuecomment-2081687671
+[mypy-wheel.*]
+ignore_missing_imports = True
 # - The following are not marked as py.typed:
 #  - jaraco: Since mypy 1.12, the root name of the untyped namespace package gets called-out too
 #  - jaraco.develop: https://github.com/jaraco/jaraco.develop/issues/22
 #  - jaraco.envs: https://github.com/jaraco/jaraco.envs/issues/7
 #  - jaraco.packaging: https://github.com/jaraco/jaraco.packaging/issues/20
 #  - jaraco.path: https://github.com/jaraco/jaraco.path/issues/2
-#  - jaraco.test: https://github.com/jaraco/jaraco.test/issues/7
 #  - jaraco.text: https://github.com/jaraco/jaraco.text/issues/17
-#  - wheel: does not intend on exposing a programmatic API https://github.com/pypa/wheel/pull/610#issuecomment-2081687671
-[mypy-distutils.*,jaraco,jaraco.develop,jaraco.envs,jaraco.packaging.*,jaraco.path,jaraco.test.*,jaraco.text,wheel.*]
+[mypy-jaraco,jaraco.develop,jaraco.envs,jaraco.packaging.*,jaraco.path,jaraco.text]
 ignore_missing_imports = True
 
 # Even when excluding a module, import issues can show up due to following import

pyproject.toml

@@ -59,7 +59,7 @@ test = [
 	# workaround for pypa/pyproject-hooks#206
 	"pyproject-hooks!=1.1",
 
-	"jaraco.test",
+	"jaraco.test>=5.5", # py.typed
 ]
 
 doc = [

ruff.toml

@@ -7,20 +7,22 @@ exclude = [
 [lint]
 extend-select = [
 	"C901",
-	"PERF401",
 	"W",
 
 	# local
 	"ANN2", # missing-return-type-*
+	"F", # Pyflakes
 	"F404", # late-future-import
 	"FA", # flake8-future-annotations
 	"I", # isort
+	"PERF", # Perflint
 	"PYI", # flake8-pyi
 	"TRY", # tryceratops
 	"UP", # pyupgrade
 	"YTT", # flake8-2020
 ]
 ignore = [
+	"PERF203", # try-except-in-loop, micro-optimisation with many false-positive. Worth checking but don't block CI
 	"TRY003", # raise-vanilla-args, avoid multitude of exception classes
 	"TRY301", # raise-within-try, it's handy
 	"UP015", # redundant-open-modes, explicit is preferred

setuptools/command/easy_install.py

@@ -2187,7 +2187,7 @@ def get_args(cls, dist, header=None):
         spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
-            for name, ep in dist.get_entry_map(group).items():
+            for name in dist.get_entry_map(group).keys():
                 cls._ensure_safe_name(name)
                 script_text = cls.template % locals()
                 args = cls._get_script_args(type_, name, header, script_text)

setuptools/tests/test_manifest.py

@@ -485,14 +485,8 @@ def test_process_template_line_invalid(self):
             'prune',
             'blarg',
         ):
-            try:
+            with pytest.raises(DistutilsTemplateError):
                 file_list.process_template_line(action)
-            except DistutilsTemplateError:
-                pass
-            except Exception:
-                assert False, "Incorrect error thrown"
-            else:
-                assert False, "Should have thrown an error"
 
     def test_include(self, caplog):
         caplog.set_level(logging.DEBUG)