Skip to content

Commit 11798df

Browse files
committed
Bump mypy to 1.14, jaraco.path to 3.7.2
1 parent cc43212 commit 11798df

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

mypy.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ ignore_missing_imports = True
5858

5959
# - wheel: does not intend on exposing a programmatic API https://github.com/pypa/wheel/pull/610#issuecomment-2081687671
6060
[mypy-wheel.*]
61-
ignore_missing_imports = True
61+
follow_untyped_imports = True
6262
# - The following are not marked as py.typed:
6363
# - jaraco: Since mypy 1.12, the root name of the untyped namespace package gets called-out too
6464
# - jaraco.develop: https://github.com/jaraco/jaraco.develop/issues/22
6565
# - jaraco.envs: https://github.com/jaraco/jaraco.envs/issues/7
6666
# - jaraco.packaging: https://github.com/jaraco/jaraco.packaging/issues/20
6767
# - jaraco.path: https://github.com/jaraco/jaraco.path/issues/2
6868
# - jaraco.text: https://github.com/jaraco/jaraco.text/issues/17
69-
[mypy-jaraco,jaraco.develop,jaraco.envs,jaraco.packaging.*,jaraco.path,jaraco.text]
70-
ignore_missing_imports = True
69+
[mypy-jaraco,jaraco.develop.*,jaraco.envs,jaraco.packaging.*,jaraco.path,jaraco.text]
70+
follow_untyped_imports = True
7171

7272
# Even when excluding a module, import issues can show up due to following import
7373
# https://github.com/python/mypy/issues/11936#issuecomment-1466764006

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ test = [
4444
"packaging>=24.2",
4545
"jaraco.envs>=2.2",
4646
"pytest-xdist>=3", # Dropped dependency on pytest-fork and py
47-
"jaraco.path>=3.2.0",
47+
"jaraco.path>=3.7.2", # Typing fixes
4848
"build[virtualenv]>=1.0.3",
4949
"filelock>=3.4.0",
5050
"ini2toml[lite]>=0.14",
@@ -135,7 +135,7 @@ type = [
135135
# pin mypy version so a new version doesn't suddenly cause the CI to fail,
136136
# until types-setuptools is removed from typeshed.
137137
# For help with static-typing issues, or mypy update, ping @Avasam
138-
"mypy>=1.12,<1.14",
138+
"mypy==1.14.*",
139139
# Typing fixes in version newer than we require at runtime
140140
"importlib_metadata>=7.0.2; python_version < '3.10'",
141141
# Imported unconditionally in tools/finalize.py

setuptools/tests/test_build_ext.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ def C(file):
179179

180180
class TestBuildExtInplace:
181181
def get_build_ext_cmd(self, optional: bool, **opts) -> build_ext:
182-
files = {
182+
files: dict[str, str | dict[str, dict[str, str]]] = {
183183
"eggs.c": "#include missingheader.h\n",
184184
".build": {"lib": {}, "tmp": {}},
185185
}
186-
path.build(files) # jaraco/path#232
186+
path.build(files)
187187
extension = Extension('spam.eggs', ['eggs.c'], optional=optional)
188188
dist = Distribution(dict(ext_modules=[extension]))
189189
dist.script_name = 'setup.py'

setuptools/tests/test_core_metadata.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io
66
from email import message_from_string
77
from email.generator import Generator
8-
from email.message import Message
8+
from email.message import EmailMessage, Message
99
from email.parser import Parser
1010
from email.policy import EmailPolicy
1111
from pathlib import Path
@@ -416,7 +416,7 @@ def _assert_roundtrip_message(metadata: str) -> None:
416416
then ensures the metadata generated by setuptools is compatible.
417417
"""
418418
with io.StringIO(metadata) as buffer:
419-
msg = Parser().parse(buffer)
419+
msg = Parser(EmailMessage).parse(buffer)
420420

421421
serialization_policy = EmailPolicy(
422422
utf8=True,

0 commit comments

Comments
 (0)