From 78e0b3cfca419d9f43efea05ceb4310932d3413a Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Wed, 27 Jul 2022 20:27:38 +0100 Subject: [PATCH] Stubtest: allowlist all of `distutils` on 3.11 (#8411) Fixes #8410 --- tests/stubtest_allowlists/darwin-py311.txt | 1 - tests/stubtest_allowlists/linux-py311.txt | 1 - tests/stubtest_allowlists/py310.txt | 48 ++++++++++++++++++++++ tests/stubtest_allowlists/py311.txt | 5 ++- tests/stubtest_allowlists/py37.txt | 48 ++++++++++++++++++++++ tests/stubtest_allowlists/py38.txt | 48 ++++++++++++++++++++++ tests/stubtest_allowlists/py39.txt | 48 ++++++++++++++++++++++ tests/stubtest_allowlists/py3_common.txt | 46 --------------------- tests/stubtest_allowlists/win32-py311.txt | 1 - 9 files changed, 196 insertions(+), 50 deletions(-) diff --git a/tests/stubtest_allowlists/darwin-py311.txt b/tests/stubtest_allowlists/darwin-py311.txt index 74d5853d8..c1d55d979 100644 --- a/tests/stubtest_allowlists/darwin-py311.txt +++ b/tests/stubtest_allowlists/darwin-py311.txt @@ -1,6 +1,5 @@ _?curses.color_pair xxlimited.Xxo.x_exports -distutils.util.__warningregistry__ # Exists at runtime, missing from stub socket.TCP_CONNECTION_INFO diff --git a/tests/stubtest_allowlists/linux-py311.txt b/tests/stubtest_allowlists/linux-py311.txt index 4938b5cbb..85d034b58 100644 --- a/tests/stubtest_allowlists/linux-py311.txt +++ b/tests/stubtest_allowlists/linux-py311.txt @@ -1,5 +1,4 @@ _?curses.color_pair -distutils.command.build_ext.__warningregistry__ mmap.MAP_STACK (os|posix).EFD_CLOEXEC (os|posix).EFD_NONBLOCK diff --git a/tests/stubtest_allowlists/py310.txt b/tests/stubtest_allowlists/py310.txt index b370842a5..94a2a810a 100644 --- a/tests/stubtest_allowlists/py310.txt +++ b/tests/stubtest_allowlists/py310.txt @@ -175,3 +175,51 @@ builtins.property.__get__ builtins.staticmethod.__get__ types.FunctionType.__get__ types.LambdaType.__get__ + +# Missing from distutils (deprecated, to be removed in 3.12) +distutils.core.Command.dump_options +distutils.core.Command.ensure_finalized +distutils.core.Distribution.announce +distutils.core.Distribution.common_usage +distutils.core.Distribution.display_option_names +distutils.core.Distribution.display_options +distutils.core.Distribution.dump_option_dicts +distutils.core.Distribution.find_config_files +distutils.core.Distribution.get_command_packages +distutils.core.Distribution.global_options +distutils.core.Distribution.has_c_libraries +distutils.core.Distribution.has_data_files +distutils.core.Distribution.has_ext_modules +distutils.core.Distribution.has_headers +distutils.core.Distribution.has_modules +distutils.core.Distribution.has_pure_modules +distutils.core.Distribution.has_scripts +distutils.core.Distribution.is_pure +distutils.core.Distribution.negative_opt +distutils.core.Distribution.parse_command_line +distutils.core.Distribution.print_command_list +distutils.core.Distribution.reinitialize_command +distutils.core.Distribution.run_commands +distutils.cygwinccompiler.PIPE +distutils.cygwinccompiler.is_cygwingcc +distutils.dist.Distribution.announce +distutils.dist.Distribution.common_usage +distutils.dist.Distribution.display_option_names +distutils.dist.Distribution.display_options +distutils.dist.Distribution.dump_option_dicts +distutils.dist.Distribution.find_config_files +distutils.dist.Distribution.get_command_packages +distutils.dist.Distribution.global_options +distutils.dist.Distribution.has_c_libraries +distutils.dist.Distribution.has_data_files +distutils.dist.Distribution.has_ext_modules +distutils.dist.Distribution.has_headers +distutils.dist.Distribution.has_modules +distutils.dist.Distribution.has_pure_modules +distutils.dist.Distribution.has_scripts +distutils.dist.Distribution.is_pure +distutils.dist.Distribution.negative_opt +distutils.dist.Distribution.parse_command_line +distutils.dist.Distribution.print_command_list +distutils.dist.Distribution.reinitialize_command +distutils.dist.Distribution.run_commands diff --git a/tests/stubtest_allowlists/py311.txt b/tests/stubtest_allowlists/py311.txt index bd84cff97..729dbb27e 100644 --- a/tests/stubtest_allowlists/py311.txt +++ b/tests/stubtest_allowlists/py311.txt @@ -17,7 +17,6 @@ _operator.itemgetter.__vectorcalloffset__ argparse._MutuallyExclusiveGroup.add_mutually_exclusive_group asynchat.__warningregistry__ # Removal planned for 3.12, can add if someone needs this configparser.LegacyInterpolation.__init__ -distutils.util.get_host_platform enum.Enum.__init__ fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve ftplib.FTP.trust_server_pasv_ipv4_address @@ -176,3 +175,7 @@ wsgiref.types.WSGIEnvironment # https://github.com/python/mypy/issues/12821 (stubtest bug with Callable type alias) wsgiref.types.WSGIApplication + +# stubtest confuses stdlib distutils with setuptools-bundled distutils (#8410), +# and the whole directory is going to be removed in 3.12 anyway +distutils\..* diff --git a/tests/stubtest_allowlists/py37.txt b/tests/stubtest_allowlists/py37.txt index 8f3eb69e8..d4808f48b 100644 --- a/tests/stubtest_allowlists/py37.txt +++ b/tests/stubtest_allowlists/py37.txt @@ -160,3 +160,51 @@ builtins.property.__get__ builtins.staticmethod.__get__ types.FunctionType.__get__ types.LambdaType.__get__ + +# Missing from distutils (deprecated, to be removed in 3.12) +distutils.core.Command.dump_options +distutils.core.Command.ensure_finalized +distutils.core.Distribution.announce +distutils.core.Distribution.common_usage +distutils.core.Distribution.display_option_names +distutils.core.Distribution.display_options +distutils.core.Distribution.dump_option_dicts +distutils.core.Distribution.find_config_files +distutils.core.Distribution.get_command_packages +distutils.core.Distribution.global_options +distutils.core.Distribution.has_c_libraries +distutils.core.Distribution.has_data_files +distutils.core.Distribution.has_ext_modules +distutils.core.Distribution.has_headers +distutils.core.Distribution.has_modules +distutils.core.Distribution.has_pure_modules +distutils.core.Distribution.has_scripts +distutils.core.Distribution.is_pure +distutils.core.Distribution.negative_opt +distutils.core.Distribution.parse_command_line +distutils.core.Distribution.print_command_list +distutils.core.Distribution.reinitialize_command +distutils.core.Distribution.run_commands +distutils.cygwinccompiler.PIPE +distutils.cygwinccompiler.is_cygwingcc +distutils.dist.Distribution.announce +distutils.dist.Distribution.common_usage +distutils.dist.Distribution.display_option_names +distutils.dist.Distribution.display_options +distutils.dist.Distribution.dump_option_dicts +distutils.dist.Distribution.find_config_files +distutils.dist.Distribution.get_command_packages +distutils.dist.Distribution.global_options +distutils.dist.Distribution.has_c_libraries +distutils.dist.Distribution.has_data_files +distutils.dist.Distribution.has_ext_modules +distutils.dist.Distribution.has_headers +distutils.dist.Distribution.has_modules +distutils.dist.Distribution.has_pure_modules +distutils.dist.Distribution.has_scripts +distutils.dist.Distribution.is_pure +distutils.dist.Distribution.negative_opt +distutils.dist.Distribution.parse_command_line +distutils.dist.Distribution.print_command_list +distutils.dist.Distribution.reinitialize_command +distutils.dist.Distribution.run_commands diff --git a/tests/stubtest_allowlists/py38.txt b/tests/stubtest_allowlists/py38.txt index e50a633a3..1a34a2ca9 100644 --- a/tests/stubtest_allowlists/py38.txt +++ b/tests/stubtest_allowlists/py38.txt @@ -177,3 +177,51 @@ builtins.property.__get__ builtins.staticmethod.__get__ types.FunctionType.__get__ types.LambdaType.__get__ + +# Missing from distutils (deprecated, to be removed in 3.12) +distutils.core.Command.dump_options +distutils.core.Command.ensure_finalized +distutils.core.Distribution.announce +distutils.core.Distribution.common_usage +distutils.core.Distribution.display_option_names +distutils.core.Distribution.display_options +distutils.core.Distribution.dump_option_dicts +distutils.core.Distribution.find_config_files +distutils.core.Distribution.get_command_packages +distutils.core.Distribution.global_options +distutils.core.Distribution.has_c_libraries +distutils.core.Distribution.has_data_files +distutils.core.Distribution.has_ext_modules +distutils.core.Distribution.has_headers +distutils.core.Distribution.has_modules +distutils.core.Distribution.has_pure_modules +distutils.core.Distribution.has_scripts +distutils.core.Distribution.is_pure +distutils.core.Distribution.negative_opt +distutils.core.Distribution.parse_command_line +distutils.core.Distribution.print_command_list +distutils.core.Distribution.reinitialize_command +distutils.core.Distribution.run_commands +distutils.cygwinccompiler.PIPE +distutils.cygwinccompiler.is_cygwingcc +distutils.dist.Distribution.announce +distutils.dist.Distribution.common_usage +distutils.dist.Distribution.display_option_names +distutils.dist.Distribution.display_options +distutils.dist.Distribution.dump_option_dicts +distutils.dist.Distribution.find_config_files +distutils.dist.Distribution.get_command_packages +distutils.dist.Distribution.global_options +distutils.dist.Distribution.has_c_libraries +distutils.dist.Distribution.has_data_files +distutils.dist.Distribution.has_ext_modules +distutils.dist.Distribution.has_headers +distutils.dist.Distribution.has_modules +distutils.dist.Distribution.has_pure_modules +distutils.dist.Distribution.has_scripts +distutils.dist.Distribution.is_pure +distutils.dist.Distribution.negative_opt +distutils.dist.Distribution.parse_command_line +distutils.dist.Distribution.print_command_list +distutils.dist.Distribution.reinitialize_command +distutils.dist.Distribution.run_commands diff --git a/tests/stubtest_allowlists/py39.txt b/tests/stubtest_allowlists/py39.txt index 5783e943d..5f70b7259 100644 --- a/tests/stubtest_allowlists/py39.txt +++ b/tests/stubtest_allowlists/py39.txt @@ -176,3 +176,51 @@ builtins.property.__get__ builtins.staticmethod.__get__ types.FunctionType.__get__ types.LambdaType.__get__ + +# Missing from distutils (deprecated, to be removed in 3.12) +distutils.core.Command.dump_options +distutils.core.Command.ensure_finalized +distutils.core.Distribution.announce +distutils.core.Distribution.common_usage +distutils.core.Distribution.display_option_names +distutils.core.Distribution.display_options +distutils.core.Distribution.dump_option_dicts +distutils.core.Distribution.find_config_files +distutils.core.Distribution.get_command_packages +distutils.core.Distribution.global_options +distutils.core.Distribution.has_c_libraries +distutils.core.Distribution.has_data_files +distutils.core.Distribution.has_ext_modules +distutils.core.Distribution.has_headers +distutils.core.Distribution.has_modules +distutils.core.Distribution.has_pure_modules +distutils.core.Distribution.has_scripts +distutils.core.Distribution.is_pure +distutils.core.Distribution.negative_opt +distutils.core.Distribution.parse_command_line +distutils.core.Distribution.print_command_list +distutils.core.Distribution.reinitialize_command +distutils.core.Distribution.run_commands +distutils.cygwinccompiler.PIPE +distutils.cygwinccompiler.is_cygwingcc +distutils.dist.Distribution.announce +distutils.dist.Distribution.common_usage +distutils.dist.Distribution.display_option_names +distutils.dist.Distribution.display_options +distutils.dist.Distribution.dump_option_dicts +distutils.dist.Distribution.find_config_files +distutils.dist.Distribution.get_command_packages +distutils.dist.Distribution.global_options +distutils.dist.Distribution.has_c_libraries +distutils.dist.Distribution.has_data_files +distutils.dist.Distribution.has_ext_modules +distutils.dist.Distribution.has_headers +distutils.dist.Distribution.has_modules +distutils.dist.Distribution.has_pure_modules +distutils.dist.Distribution.has_scripts +distutils.dist.Distribution.is_pure +distutils.dist.Distribution.negative_opt +distutils.dist.Distribution.parse_command_line +distutils.dist.Distribution.print_command_list +distutils.dist.Distribution.reinitialize_command +distutils.dist.Distribution.run_commands diff --git a/tests/stubtest_allowlists/py3_common.txt b/tests/stubtest_allowlists/py3_common.txt index 37d649462..274bb0e2b 100644 --- a/tests/stubtest_allowlists/py3_common.txt +++ b/tests/stubtest_allowlists/py3_common.txt @@ -646,44 +646,20 @@ distutils.command.build_ext.USER_BASE distutils.command.build_scripts.ST_MODE distutils.command.install.* distutils.command.install_scripts.ST_MODE -distutils.core.Command.dump_options -distutils.core.Command.ensure_finalized distutils.core.DEBUG distutils.core.USAGE -distutils.core.Distribution.announce -distutils.core.Distribution.common_usage -distutils.core.Distribution.display_option_names -distutils.core.Distribution.display_options -distutils.core.Distribution.dump_option_dicts distutils.core.Distribution.finalize_options -distutils.core.Distribution.find_config_files distutils.core.Distribution.get_command_class distutils.core.Distribution.get_command_list -distutils.core.Distribution.get_command_packages -distutils.core.Distribution.global_options distutils.core.Distribution.handle_display_options -distutils.core.Distribution.has_c_libraries -distutils.core.Distribution.has_data_files -distutils.core.Distribution.has_ext_modules -distutils.core.Distribution.has_headers -distutils.core.Distribution.has_modules -distutils.core.Distribution.has_pure_modules -distutils.core.Distribution.has_scripts -distutils.core.Distribution.is_pure -distutils.core.Distribution.negative_opt -distutils.core.Distribution.parse_command_line -distutils.core.Distribution.print_command_list distutils.core.Distribution.print_commands -distutils.core.Distribution.reinitialize_command distutils.core.Distribution.run_command -distutils.core.Distribution.run_commands distutils.core.extension_keywords distutils.core.gen_usage distutils.core.setup_keywords distutils.cygwinccompiler.CONFIG_H_NOTOK distutils.cygwinccompiler.CONFIG_H_OK distutils.cygwinccompiler.CONFIG_H_UNCERTAIN -distutils.cygwinccompiler.PIPE distutils.cygwinccompiler.CygwinCCompiler.compiler_type distutils.cygwinccompiler.CygwinCCompiler.exe_extension distutils.cygwinccompiler.CygwinCCompiler.obj_extension @@ -695,36 +671,14 @@ distutils.cygwinccompiler.Mingw32CCompiler.compiler_type distutils.cygwinccompiler.check_config_h distutils.cygwinccompiler.get_msvcr distutils.cygwinccompiler.get_versions -distutils.cygwinccompiler.is_cygwingcc distutils.dir_util.ensure_relative distutils.dist.DEBUG -distutils.dist.Distribution.announce -distutils.dist.Distribution.common_usage -distutils.dist.Distribution.display_option_names -distutils.dist.Distribution.display_options -distutils.dist.Distribution.dump_option_dicts distutils.dist.Distribution.finalize_options -distutils.dist.Distribution.find_config_files distutils.dist.Distribution.get_command_class distutils.dist.Distribution.get_command_list -distutils.dist.Distribution.get_command_packages -distutils.dist.Distribution.global_options distutils.dist.Distribution.handle_display_options -distutils.dist.Distribution.has_c_libraries -distutils.dist.Distribution.has_data_files -distutils.dist.Distribution.has_ext_modules -distutils.dist.Distribution.has_headers -distutils.dist.Distribution.has_modules -distutils.dist.Distribution.has_pure_modules -distutils.dist.Distribution.has_scripts -distutils.dist.Distribution.is_pure -distutils.dist.Distribution.negative_opt -distutils.dist.Distribution.parse_command_line -distutils.dist.Distribution.print_command_list distutils.dist.Distribution.print_commands -distutils.dist.Distribution.reinitialize_command distutils.dist.Distribution.run_command -distutils.dist.Distribution.run_commands distutils.dist.DistributionMetadata.set_classifiers distutils.dist.DistributionMetadata.set_keywords distutils.dist.DistributionMetadata.set_platforms diff --git a/tests/stubtest_allowlists/win32-py311.txt b/tests/stubtest_allowlists/win32-py311.txt index d201ba37e..bfda0e031 100644 --- a/tests/stubtest_allowlists/win32-py311.txt +++ b/tests/stubtest_allowlists/win32-py311.txt @@ -9,7 +9,6 @@ asyncio.IocpProactor.sendto asyncio.windows_events.IocpProactor.recvfrom asyncio.windows_events.IocpProactor.recvfrom_into asyncio.windows_events.IocpProactor.sendto -distutils.command.build_ext.__warningregistry__ msvcrt.GetErrorMode os.EX_OK subprocess.STARTUPINFO.copy