From cc79f78589e3ef4fc584d73957365acf97be8709 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Mon, 25 Nov 2024 17:11:05 +0100 Subject: [PATCH 1/6] Fix unnecessary 'pyright: ignore' warning in CI --- stubs/setuptools/setuptools/compat/py310.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi index 9e27329c7d96..36c31bbf9ec7 100644 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ b/stubs/setuptools/setuptools/compat/py310.pyi @@ -6,4 +6,4 @@ 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] + import tomli as tomllib # type: ignore[import-not-found] From e7bb14a406a2a2ab44920e281ed5d47fb1f7a1eb Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Mon, 25 Nov 2024 17:15:07 +0100 Subject: [PATCH 2/6] revert --- stubs/setuptools/setuptools/compat/py310.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi index 36c31bbf9ec7..9e27329c7d96 100644 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ b/stubs/setuptools/setuptools/compat/py310.pyi @@ -6,4 +6,4 @@ if sys.version_info >= (3, 11): import tomllib else: # This is actually vendored - import tomli as tomllib # type: ignore[import-not-found] + import tomli as tomllib # type: ignore[import-not-found] # pyright: ignore[reportMissingImports] From 6550d2cf2a37dd652e066c006e60e12a31db6fbc Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Mon, 25 Nov 2024 17:21:07 +0100 Subject: [PATCH 3/6] Try a workaround --- stubs/setuptools/setuptools/compat/py310.pyi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi index 9e27329c7d96..aa7942260fa9 100644 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ b/stubs/setuptools/setuptools/compat/py310.pyi @@ -1,3 +1,4 @@ +from typing import Any import sys __all__ = ["tomllib"] @@ -5,5 +6,6 @@ __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] + # This is actually vendored, but CI is flaky when using the following line: + # import tomli as tomllib + tomllib: Any From 032ce3df719889daa88f46db2da442071121e6fe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:22:44 +0000 Subject: [PATCH 4/6] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/setuptools/setuptools/compat/py310.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi index aa7942260fa9..a42104f74328 100644 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ b/stubs/setuptools/setuptools/compat/py310.pyi @@ -1,5 +1,5 @@ -from typing import Any import sys +from typing import Any __all__ = ["tomllib"] From c8fde86fe52345565b2a93144811e26541746a57 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Mon, 25 Nov 2024 18:20:34 +0100 Subject: [PATCH 5/6] Install tomli --- requirements-tests.txt | 3 +++ stubs/setuptools/setuptools/compat/py310.pyi | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements-tests.txt b/requirements-tests.txt index 77622c1fd88c..fbd6133d0781 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -23,3 +23,6 @@ uv==0.4.26 # Utilities for typeshed infrastructure scripts. ts_utils @ file:lib + +# Libraries required by third-party stubs +tomli; python_version < "3.11" # setuptools.compat.py310 diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi index a42104f74328..11bcd5cfaa53 100644 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ b/stubs/setuptools/setuptools/compat/py310.pyi @@ -6,6 +6,5 @@ __all__ = ["tomllib"] if sys.version_info >= (3, 11): import tomllib else: - # This is actually vendored, but CI is flaky when using the following line: - # import tomli as tomllib - tomllib: Any + # This is actually vendored + import tomli as tomllib From 7a9f5b3fcf2ee6ac2c5ca443449a87d29ddabc9d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:22:17 +0000 Subject: [PATCH 6/6] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/setuptools/setuptools/compat/py310.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stubs/setuptools/setuptools/compat/py310.pyi b/stubs/setuptools/setuptools/compat/py310.pyi index 11bcd5cfaa53..0498105394f2 100644 --- a/stubs/setuptools/setuptools/compat/py310.pyi +++ b/stubs/setuptools/setuptools/compat/py310.pyi @@ -1,5 +1,4 @@ import sys -from typing import Any __all__ = ["tomllib"]