Skip to content

Commit e2a5d27

Browse files
committed
Fix stubtest
1 parent 4a6ca73 commit e2a5d27

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

lib/ts_utils/mypy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class MypyDistConf(NamedTuple):
2222
# The configuration section in the metadata file looks like the following, with multiple module sections possible
2323
# [mypy-tests]
2424
# [mypy-tests.yaml]
25-
# module_name = "yaml"
25+
# module-name = "yaml"
2626
# [mypy-tests.yaml.values]
2727
# disallow_incomplete_defs = true
2828
# disallow_untyped_defs = true
@@ -39,9 +39,9 @@ def mypy_configuration_from_distribution(distribution: str) -> list[MypyDistConf
3939

4040
def validate_configuration(section_name: str, mypy_section: dict[str, Any]) -> MypyDistConf:
4141
assert isinstance(mypy_section, dict), f"{section_name} should be a section"
42-
module_name = mypy_section.get("module_name")
42+
module_name = mypy_section.get("module-name")
4343

44-
assert module_name is not None, f"{section_name} should have a module_name key"
44+
assert module_name is not None, f"{section_name} should have a module-name key"
4545
assert isinstance(module_name, str), f"{section_name} should be a key-value pair"
4646

4747
assert "values" in mypy_section, f"{section_name} should have a values section"

stubs/setuptools/@tests/stubtest_allowlist.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Is a functools.partial, so stubtest says "is not a function"
2-
setuptools._distutils._modified.newer_pairwise_group
3-
41
# Runtime initializes to None, but this really should never be None when used
52
setuptools._distutils.compilers.C.base.Compiler.compiler_type
63

@@ -37,6 +34,7 @@ setuptools._distutils.command.install.INSTALL_SCHEMES
3734
setuptools._distutils.command.install.SCHEME_KEYS
3835
setuptools._distutils.command.install.WINDOWS_SCHEME
3936
setuptools._distutils.command.install_lib.PYTHON_SOURCE_EXTENSION
37+
setuptools._distutils.dir_util.SkipRepeatAbsolutePaths.instance
4038
setuptools._distutils.dist.fix_help_options
4139
setuptools._distutils.extension.read_setup_file
4240
setuptools._distutils.filelist.findall
@@ -52,7 +50,6 @@ setuptools._distutils.sysconfig.parse_config_h
5250
setuptools._distutils.sysconfig.parse_makefile
5351
setuptools._distutils.sysconfig.project_base
5452
setuptools._distutils.sysconfig.python_build
55-
setuptools._distutils.util.is_freethreaded
5653
setuptools._distutils.util.MACOSX_VERSION_VAR
5754

5855
# Missing submodules from setuptools._distutils
@@ -70,9 +67,7 @@ setuptools._distutils.compat.numpy
7067
setuptools._distutils.compat.py39
7168
setuptools._distutils.core
7269
setuptools._distutils.debug
73-
setuptools._distutils.dir_util
7470
setuptools._distutils.fancy_getopt
75-
setuptools._distutils.file_util
7671
setuptools._distutils.log
7772
setuptools._distutils.text_file
7873
setuptools._distutils.version.Version._cmp # abstract method

stubs/setuptools/METADATA.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@ it is no longer included with `types-setuptools`.
99
# darwin is equivalent to linux for OS-specific methods
1010
ci-platforms = ["linux", "win32"]
1111
stubtest-dependencies = ["more_itertools", "tomli"]
12+
13+
# Stubtest fails on trying to run mypy on the source files rather than our stubs
14+
[mypy-tests.distutils]
15+
module-name = "setuptools._distutils.compilers.C.*"
16+
values = { ignore_errors = true }

0 commit comments

Comments
 (0)