Merge remote-tracking branch 'upstream/master' into bugfix/gh-19186-typevarlikes-defaults

Author: ilevkivskyi

.github/workflows/test.yml

@@ -79,12 +79,18 @@ jobs:
         #   # allow_failure: true
         #   test_mypyc: true
 
-        - name: mypyc runtime tests with py39-macos
-          python: '3.9.21'
-          # TODO: macos-13 is the last one to support Python 3.9, change it to macos-latest when updating the Python version
-          os: macos-13
+        - name: mypyc runtime tests with py313-macos
+          python: '3.13'
+          os: macos-latest
           toxenv: py
           tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
+
+        - name: mypyc runtime tests with py310-ubuntu
+          python: '3.10'
+          os: ubuntu-latest
+          toxenv: py
+          tox_extra_args: "-n 3 mypyc/test/test_run.py mypyc/test/test_external.py"
+
         # This is broken. See
         # - https://github.com/python/mypy/issues/17819
         # - https://github.com/python/mypy/pull/17822

.pre-commit-config.yaml

@@ -6,14 +6,14 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
+    rev: 25.9.0
     hooks:
       - id: black
         exclude: '^(test-data/)'
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.4
+    rev: v0.14.3
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--exit-non-zero-on-fix]
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.32.1

LICENSE

@@ -227,3 +227,38 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+= = = = =
+
+Files under lib-rt/base64 are licensed under the following license.
+
+= = = = =
+
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015-2018, Wojciech Muła
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) 2013-2022, Alfred Klomp
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docs/source/command_line.rst

@@ -1159,7 +1159,7 @@ format into the specified directory.
 Enabling incomplete/experimental features
 *****************************************
 
-.. option:: --enable-incomplete-feature {PreciseTupleTypes, InlineTypedDict}
+.. option:: --enable-incomplete-feature {PreciseTupleTypes,InlineTypedDict,TypeForm}
 
     Some features may require several mypy releases to implement, for example
     due to their complexity, potential for backwards incompatibility, or
@@ -1211,8 +1211,11 @@ List of currently incomplete/experimental features:
 
   .. code-block:: python
 
-     def test_values() -> {"int": int, "str": str}:
-         return {"int": 42, "str": "test"}
+     def test_values() -> {"width": int, "description": str}:
+         return {"width": 42, "description": "test"}
+
+* ``TypeForm``: this feature enables ``TypeForm``, as described in
+  `PEP 747 – Annotating Type Forms <https://peps.python.org/pep-0747/>_`.
 
 
 Miscellaneous

docs/source/duck_type_compatibility.rst

@@ -9,6 +9,8 @@ supported for a small set of built-in types:
 * ``int`` is duck type compatible with ``float`` and ``complex``.
 * ``float`` is duck type compatible with ``complex``.
 * ``bytearray`` and ``memoryview`` are duck type compatible with ``bytes``.
+  (this will be disabled by default in **mypy 2.0**, and currently can be
+  disabled with :option:`--strict-bytes <mypy --strict-bytes>`.)
 
 For example, mypy considers an ``int`` object to be valid whenever a
 ``float`` object is expected.  Thus code like this is nice and clean

docs/source/error_code_list.rst

@@ -1286,6 +1286,65 @@ type must be a subtype of the original type::
     def g(x: object) -> TypeIs[str]:  # OK
         ...
 
+.. _code-maybe-unrecognized-str-typeform:
+
+String appears in a context which expects a TypeForm [maybe-unrecognized-str-typeform]
+--------------------------------------------------------------------------------------
+
+TypeForm literals may contain string annotations:
+
+.. code-block:: python
+
+   typx1: TypeForm = str | None
+   typx2: TypeForm = 'str | None'  # OK
+   typx3: TypeForm = 'str' | None  # OK
+
+However TypeForm literals containing a string annotation can only be recognized
+by mypy in the following locations:
+
+.. code-block:: python
+
+   typx_var: TypeForm = 'str | None'  # assignment r-value
+
+   def func(typx_param: TypeForm) -> TypeForm:
+       return 'str | None'  # returned expression
+
+   func('str | None')  # callable's argument
+
+If you try to use a string annotation in some other location
+which expects a TypeForm, the string value will always be treated as a ``str``
+even if a ``TypeForm`` would be more appropriate and this error code
+will be generated:
+
+.. code-block:: python
+
+   # Error: TypeForm containing a string annotation cannot be recognized here. Surround with TypeForm(...) to recognize.  [maybe-unrecognized-str-typeform]
+   # Error: List item 0 has incompatible type "str"; expected "TypeForm[Any]"  [list-item]
+   list_of_typx: list[TypeForm] = ['str | None', float]
+
+Fix the error by surrounding the entire type with ``TypeForm(...)``:
+
+.. code-block:: python
+
+   list_of_typx: list[TypeForm] = [TypeForm('str | None'), float]  # OK
+
+Similarly, if you try to use a string literal in a location which expects a
+TypeForm, this error code will be generated:
+
+.. code-block:: python
+
+   dict_of_typx = {'str_or_none': TypeForm(str | None)}
+   # Error: TypeForm containing a string annotation cannot be recognized here. Surround with TypeForm(...) to recognize.  [maybe-unrecognized-str-typeform]
+   list_of_typx: list[TypeForm] = [dict_of_typx['str_or_none']]
+
+Fix the error by adding ``# type: ignore[maybe-unrecognized-str-typeform]``
+to the line with the string literal:
+
+.. code-block:: python
+
+   dict_of_typx = {'str_or_none': TypeForm(str | None)}
+   list_of_typx: list[TypeForm] = [dict_of_typx['str_or_none']]  # type: ignore[maybe-unrecognized-str-typeform]
+
 .. _code-misc:
 
 Miscellaneous checks [misc]

docs/source/kinds_of_types.rst

@@ -294,6 +294,7 @@ isn't supported by the runtime with some limitations, if you use
    def f(x: int | str) -> None:   # OK on Python 3.7 and later
        ...
 
+.. _no-strict-optional:
 .. _strict_optional:
 
 Optional types and the None type

docs/source/typed_dict.rst

@@ -303,8 +303,8 @@ to use inline TypedDict syntax. For example:
 
 .. code-block:: python
 
-    def test_values() -> {"int": int, "str": str}:
-        return {"int": 42, "str": "test"}
+    def test_values() -> {"width": int, "description": str}:
+        return {"width": 42, "description": "test"}
 
     class Response(TypedDict):
         status: int

misc/analyze_typeform_stats.py

@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+"""
+Analyze TypeForm parsing efficiency from mypy build stats.
+
+Usage:
+    python3 analyze_typeform_stats.py '<mypy_output_with_stats>'
+    python3 -m mypy --dump-build-stats file.py 2>&1 | python3 analyze_typeform_stats.py
+
+Example output:
+    TypeForm Expression Parsing Statistics:
+    ==================================================
+    Total calls to SA.try_parse_as_type_expression: 14,555
+    Quick rejections (no full parse): 14,255
+    Full parses attempted: 300
+    - Successful: 248
+    - Failed: 52
+
+    Efficiency Metrics:
+    - Quick rejection rate: 97.9%
+    - Full parse rate: 2.1%
+    - Full parse success rate: 82.7%
+    - Overall success rate: 1.7%
+
+    Performance Implications:
+    - Expensive failed full parses: 52 (0.4% of all calls)
+
+See also:
+    - mypy/semanal.py: SemanticAnalyzer.try_parse_as_type_expression()
+    - mypy/semanal.py: DEBUG_TYPE_EXPRESSION_FULL_PARSE_FAILURES
+"""
+
+import re
+import sys
+
+
+def analyze_stats(output: str) -> None:
+    """Parse mypy stats output and calculate TypeForm parsing efficiency."""
+
+    # Extract the three counters
+    total_match = re.search(r"type_expression_parse_count:\s*(\d+)", output)
+    success_match = re.search(r"type_expression_full_parse_success_count:\s*(\d+)", output)
+    failure_match = re.search(r"type_expression_full_parse_failure_count:\s*(\d+)", output)
+
+    if not (total_match and success_match and failure_match):
+        print("Error: Could not find all required counters in output")
+        return
+
+    total = int(total_match.group(1))
+    successes = int(success_match.group(1))
+    failures = int(failure_match.group(1))
+
+    full_parses = successes + failures
+
+    print("TypeForm Expression Parsing Statistics:")
+    print("=" * 50)
+    print(f"Total calls to SA.try_parse_as_type_expression: {total:,}")
+    print(f"Quick rejections (no full parse): {total - full_parses:,}")
+    print(f"Full parses attempted: {full_parses:,}")
+    print(f"  - Successful: {successes:,}")
+    print(f"  - Failed: {failures:,}")
+    if total > 0:
+        print()
+        print("Efficiency Metrics:")
+        print(f"  - Quick rejection rate: {((total - full_parses) / total * 100):.1f}%")
+        print(f"  - Full parse rate: {(full_parses / total * 100):.1f}%")
+        print(f"  - Full parse success rate: {(successes / full_parses * 100):.1f}%")
+        print(f"  - Overall success rate: {(successes / total * 100):.1f}%")
+        print()
+        print("Performance Implications:")
+        print(
+            f"  - Expensive failed full parses: {failures:,} ({(failures / total * 100):.1f}% of all calls)"
+        )
+
+
+if __name__ == "__main__":
+    if len(sys.argv) == 1:
+        # Read from stdin
+        output = sys.stdin.read()
+    elif len(sys.argv) == 2:
+        # Read from command line argument
+        output = sys.argv[1]
+    else:
+        print("Usage: python3 analyze_typeform_stats.py [mypy_output_with_stats]")
+        print("Examples:")
+        print(
+            "  python3 -m mypy --dump-build-stats file.py 2>&1 | python3 analyze_typeform_stats.py"
+        )
+        print("  python3 analyze_typeform_stats.py 'output_string'")
+        sys.exit(1)
+
+    analyze_stats(output)

mypy-requirements.txt

@@ -4,4 +4,4 @@ typing_extensions>=4.6.0
 mypy_extensions>=1.0.0
 pathspec>=0.9.0
 tomli>=1.1.0; python_version<'3.11'
-librt>=0.3.0
+librt>=0.6.2