Merge remote-tracking branch 'upstream/master' into intf-impl-parallel

Author: ilevkivskyi

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
     hooks:
       - id: codespell
         args:
-          - --ignore-words-list=HAX,ccompiler,ot,statics,whet,zar
+          - --ignore-words-list=HAX,Nam,ccompiler,ot,statics,whet,zar
         exclude: ^(mypy/test/|mypy/typeshed/|mypyc/test-data/|test-data/).+$
   - repo: https://github.com/rhysd/actionlint
     rev: v1.7.7

CHANGELOG.md

@@ -5,6 +5,7 @@
 prune mypy/typeshed
 include mypy/typeshed/LICENSE
 include mypy/typeshed/stdlib/VERSIONS
+include mypy/typeshed/stdlib/_typeshed/README.md
 recursive-include mypy/typeshed *.pyi
 
 # mypy and mypyc
@@ -38,14 +39,16 @@ include test-requirements.in
 include test-requirements.txt
 include mypy_self_check.ini
 prune misc
+include misc/diff-cache.py
+include misc/apply-cache-diff.py
 graft test-data
 graft mypy/test
 include conftest.py
 include runtests.py
 include tox.ini
 
-include LICENSE mypyc/README.md CHANGELOG.md
-exclude .gitmodules CONTRIBUTING.md CREDITS ROADMAP.md action.yml .editorconfig
+include LICENSE mypyc/README.md CHANGELOG.md CREDITS
+exclude .gitmodules CONTRIBUTING.md ROADMAP.md action.yml .editorconfig
 exclude .git-blame-ignore-revs .pre-commit-config.yaml
 
 global-exclude *.py[cod]

MANIFEST.in

@@ -551,7 +551,7 @@ potentially problematic or redundant in some way.
     .. note::
 
         Mypy currently cannot detect and report unreachable or redundant code
-        inside any functions using :ref:`type-variable-value-restriction`.
+        inside any functions using :ref:`value-constrained type variables <value-constrained-type-variables>`.
 
         This limitation will be removed in future releases of mypy.
 
@@ -598,7 +598,7 @@ of the above sections.
 .. option:: --allow-redefinition-new
 
     By default, mypy won't allow a variable to be redefined with an
-    unrelated type. This flag enables the redefinition of unannotated
+    unrelated type. This flag enables the redefinition of *unannotated*
     variables with an arbitrary type. You will also need to enable
     :option:`--local-partial-types <mypy --local-partial-types>`.
     Example:
@@ -645,7 +645,6 @@ of the above sections.
 
     Note: We are planning to turn this flag on by default in a future mypy
     release, along with :option:`--local-partial-types <mypy --local-partial-types>`.
-    The feature is still experimental, and the semantics may still change.
 
 .. option:: --allow-redefinition
 
@@ -1019,9 +1018,10 @@ beyond what incremental mode can offer, try running mypy in
     writing to the cache, use ``--cache-dir=/dev/null`` (UNIX)
     or ``--cache-dir=nul`` (Windows).
 
-.. option:: --sqlite-cache
+.. option:: --no-sqlite-cache
 
-    Use an `SQLite`_ database to store the cache.
+    Avoid using `SQLite`_ database to store the cache, instead write cache data
+    out to individual files.
 
 .. option:: --cache-fine-grained
 

docs/source/command_line.rst

@@ -303,9 +303,13 @@ See :ref:`type-narrowing` for more information.
 Invariance vs covariance
 ------------------------
 
-Most mutable generic collections are invariant, and mypy considers all
-user-defined generic classes invariant by default
-(see :ref:`variance-of-generics` for motivation). This could lead to some
+Most mutable generic collections are invariant. When using the legacy
+``TypeVar`` syntax, mypy considers all user-defined generic classes invariant
+by default (see :ref:`variance-of-generics` for motivation). When using the
+:pep:`695` syntax (``class MyClass[T]: ...``), variance is inferred from
+usage rather than defaulting to invariant.
+
+The fact that mutable sequences are usually invariant can lead to some
 unexpected errors when combined with type inference. For example:
 
 .. code-block:: python

docs/source/common_issues.rst

@@ -979,7 +979,7 @@ These options may only be set in the global section (``[mypy]``).
 .. confval:: sqlite_cache
 
     :type: boolean
-    :default: False
+    :default: True
 
     Use an `SQLite`_ database to store the cache.
 

docs/source/config_file.rst

@@ -693,10 +693,11 @@ contravariant, use type variables defined with special keyword arguments
    my_box = Box(Square())
    look_into(my_box)  # OK, but mypy would complain here for an invariant type
 
+.. _value-constrained-type-variables:
 .. _type-variable-value-restriction:
 
-Type variables with value restriction
-*************************************
+Value-constrained type variables
+*********************************
 
 By default, a type variable can be replaced with any type -- or any type that
 is a subtype of the upper bound, which defaults to ``object``. However, sometimes
@@ -727,8 +728,9 @@ The same thing is also possibly using the legacy syntax (Python 3.11 or earlier)
    def concat(x: AnyStr, y: AnyStr) -> AnyStr:
        return x + y
 
-No matter which syntax you use, such a type variable is called a type variable
-with a value restriction. Importantly, this is different from a union type,
+No matter which syntax you use, such a type variable is called a
+value-constrained type variable (the allowed types are accessible at runtime
+via ``TypeVar.__constraints__``). Importantly, this is different from a union type,
 since combinations of ``str`` and ``bytes`` are not accepted:
 
 .. code-block:: python
@@ -760,7 +762,7 @@ for the type variable, which in this case is ``str``.
 
 This is thus subtly different from using ``str | bytes`` as an upper bound,
 where the return type would be ``S`` (see :ref:`type-variable-upper-bound`).
-Using a value restriction is correct for ``concat``, since ``concat``
+Using a value constraint is correct for ``concat``, since ``concat``
 actually returns a ``str`` instance in the above example:
 
 .. code-block:: python
@@ -775,7 +777,7 @@ value of :py:func:`re.compile`, where ``S`` can be either ``str``
 or ``bytes``. Regular expressions can be based on a string or a
 bytes pattern.
 
-A type variable may not have both a value restriction and an upper bound.
+A type variable may not have both value constraints and an upper bound.
 
 Note that you may come across :py:data:`~typing.AnyStr` imported from
 :py:mod:`typing`. This feature is now deprecated, but it means the same
@@ -1330,7 +1332,7 @@ Here are examples using the legacy syntax (Python 3.11 and earlier):
     for i, j in NewVec[int]():
         ...
 
-Using type variable bounds or value restriction in generic aliases has
+Using type variable bounds or value constraints in generic aliases has
 the same effect as in generic classes and functions.
 
 

docs/source/generics.rst

@@ -303,8 +303,8 @@ Here is the same example using the legacy syntax (Python 3.11 and earlier):
 .. note::
 
    If you just need to constrain a type variable to certain types or
-   subtypes, you can use a :ref:`value restriction
-   <type-variable-value-restriction>`.
+   subtypes, you can use a :ref:`value-constrained type variable
+   <value-constrained-type-variables>`.
 
 The default values of a function's arguments don't affect its signature -- only
 the absence or presence of a default value does. So in order to reduce

docs/source/more_types.rst

@@ -183,6 +183,11 @@ The rest of this section documents the command line interface of stubtest.
 
     Ignore errors for whether an argument should or shouldn't be positional-only
 
+.. option:: --strict-type-check-only
+
+    Require :py:func:`@type_check_only <typing.type_check_only>` on private types
+    that are not present at runtime.
+
 .. option:: --allowlist FILE
 
     Use file as an allowlist. Can be passed multiple times to combine multiple

docs/source/stubtest.rst

@@ -83,7 +83,7 @@ def filter_omitted_commits(commits: list[CommitInfo]) -> list[CommitInfo]:
         ):
             # These are generated by a typeshed sync.
             keep = False
-        if re.search(r"(bump|update).*version.*\+dev", title.lower()):
+        if re.search(r"(bump|update).*version", title.lower()):
             # Version number updates aren't mentioned
             keep = False
         if "pre-commit autoupdate" in title:
@@ -155,13 +155,19 @@ def format_changelog_entry(c: CommitInfo) -> str:
 
 
 def main() -> None:
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(
+        description="Generate draft .md changelog for a mypy public release and print it to stdout."
+    )
     parser.add_argument("version", help="target mypy version (form X.Y)")
-    parser.add_argument("--local", action="store_true")
+    parser.add_argument(
+        "--local", action="store_true", help="use local release branch, not origin"
+    )
     args = parser.parse_args()
     version: str = args.version
     local: bool = args.local
 
+    version = version.removeprefix("v")
+
     if not re.match(r"[0-9]+\.[0-9]+$", version):
         sys.exit(f"error: Release must be of form X.Y (not {version!r})")
     major, minor = (int(component) for component in version.split("."))
@@ -187,7 +193,10 @@ def main() -> None:
     print(f"Generating changelog for {major}.{minor}")
     print(f"Previous release was     {prev_major}.{prev_minor}")
 
-    new_branch = f"origin/release-{major}.{minor}"
+    if local:
+        new_branch = f"release-{major}.{minor}"
+    else:
+        new_branch = f"origin/release-{major}.{minor}"
     old_branch = f"origin/release-{prev_major}.{prev_minor}"
 
     changes = find_changes_between_releases(old_branch, new_branch)