This fixesmypy forGit.AutoInterrupt andGit.CatFileContentStream. Static type checking of these was broken inadvertently in#2037, as described in#2038. This is approach (2) described in#2038. Further details are in that bug report and in the commit messages.

As in#2037, I've made sure this doesn't break Sphinx (though it would be very strange if it did), by checking locally as well as in the RTD cloud build. The entries in the latter can be examined:AutoInterrupt,CatFileContentStream.

Because CI runsmypy but does not verify its output, I'll wait to mark this non-draft until I've looked at all relevant jobs'mypy steps. (But this may be before the jobs complete, since the jobs that runmypy do so before runningpytest, not after.)

Edit: Allmypy results on CI look as they did before, and then new errors that came in with#2037 are gone.

EliahKagan added2 commits

June 7, 2025 11:35

Start on fixing AutoInterrupt/CatFileContentStream aliases

c6d16d0

This uses `TypeAlias` from the `typing` module, to make it so theassignment statments introduced ingitpython-developers#2037 (to set `Git.AutoInterrupt`and `Git.CatFileContentStream` to nonpublic module-levelimplementations `_AutoInterrupt` and `_CatFileContentStream`) aretreated by `mypy` as type aliases rather than as class variables.For details on the problem this partially fixes, seegitpython-developers#2038 and:https://mypy.readthedocs.io/en/stable/common_issues.html#variables-vs-type-aliasesThe fix won't work in this form, however, because it attempts toimport `TypeAlias` unconditionally from the standard-library`typing` module, which only gained it in Python 3.10.

ImportTypeAlias fromtyping_extensions where needed

c6c0812

The standard library `typing` module introduced `TypeAlias` inPython 3.10. This uses it from `typing_extensions` where neederd,by making three changes:- Change the version lower bound for `typing-extensions` from  3.7.4.3 to 3.10.0.2, since 3.7.4.3 doesn't offer `TypeAlias`.  (The reason not to go higher, to major version 4, is that  it no longer supports versions of Python lower than 3.9, but  we currently support Python 3.7 and Python 3.8.)- Require the `typing-extensions` dependency when using Python  versions lower than 3.10, rather than only lower than 3.7 as  before.- Conditionally import `TypeAlias` (in the `git.cmd` module) from  either `typing` or `type_extensions` depending on the Python  version, using a pattern that `mypy` and other type checkers  recognize statically.Together with the preceding commit, thisfixesgitpython-developers#2038. (This isapproach (2) described there.)