Merge remote-tracking branch 'upstream/master' into revert-dict-or

Author: ilevkivskyi

mypy/build.py

@@ -877,7 +877,7 @@ def __init__(
                 ]
             )
 
-        self.metastore = create_metastore(options, parallel_worker)
+        self.metastore = create_metastore(options)
 
         # a mapping from source files to their corresponding shadow files
         # for efficient lookup
@@ -1616,13 +1616,10 @@ def exclude_from_backups(target_dir: str) -> None:
         pass
 
 
-def create_metastore(options: Options, parallel_worker: bool = False) -> MetadataStore:
+def create_metastore(options: Options) -> MetadataStore:
     """Create the appropriate metadata store."""
     if options.sqlite_cache:
-        # We use this flag in both coordinator and workers to speed up commits,
-        # see mypy.metastore.connect_db() for details.
-        sync_off = options.num_workers > 0 or parallel_worker
-        mds: MetadataStore = SqliteMetadataStore(_cache_dir_prefix(options), sync_off=sync_off)
+        mds: MetadataStore = SqliteMetadataStore(_cache_dir_prefix(options))
     else:
         mds = FilesystemMetadataStore(_cache_dir_prefix(options))
     return mds

mypy/metastore.py

@@ -154,21 +154,20 @@ def close(self) -> None:
 """
 
 
-def connect_db(db_file: str, sync_off: bool = False) -> sqlite3.Connection:
+def connect_db(db_file: str) -> sqlite3.Connection:
     import sqlite3.dbapi2
 
     db = sqlite3.dbapi2.connect(db_file)
-    if sync_off:
-        # This is a bit unfortunate (as we may get corrupt cache after e.g. Ctrl + C),
-        # but without this flag, commits are *very* slow, especially when using HDDs,
-        # see https://www.sqlite.org/faq.html#q19 for details.
-        db.execute("PRAGMA synchronous=OFF")
+    # This is a bit unfortunate (as we may get corrupt cache after e.g. Ctrl + C),
+    # but without this flag, commits are *very* slow, especially when using HDDs,
+    # see https://www.sqlite.org/faq.html#q19 for details.
+    db.execute("PRAGMA synchronous=OFF")
     db.executescript(SCHEMA)
     return db
 
 
 class SqliteMetadataStore(MetadataStore):
-    def __init__(self, cache_dir_prefix: str, sync_off: bool = False) -> None:
+    def __init__(self, cache_dir_prefix: str) -> None:
         # We check startswith instead of equality because the version
         # will have already been appended by the time the cache dir is
         # passed here.
@@ -177,7 +176,7 @@ def __init__(self, cache_dir_prefix: str, sync_off: bool = False) -> None:
             return
 
         os.makedirs(cache_dir_prefix, exist_ok=True)
-        self.db = connect_db(os_path_join(cache_dir_prefix, "cache.db"), sync_off=sync_off)
+        self.db = connect_db(os_path_join(cache_dir_prefix, "cache.db"))
 
     def _query(self, name: str, field: str) -> Any:
         # Raises FileNotFound for consistency with the file system version

mypy/nativeparse.py

@@ -280,6 +280,7 @@ def parse_to_binary_ast(
         platform=options.platform,
         always_true=options.always_true,
         always_false=options.always_false,
+        cache_version=1,
     )
     return (
         ast_bytes,
@@ -823,6 +824,7 @@ def read_try_stmt(state: State, data: ReadBuffer) -> TryStmt:
         if has_name:
             var_name = read_str(data)
             var_expr = NameExpr(var_name)
+            read_loc(data, var_expr)
             vars_list.append(var_expr)
         else:
             vars_list.append(None)

mypyc/test-data/run-base64.test

@@ -146,9 +146,10 @@ def test_decode_with_extra_data_after_padding() -> None:
     check_decode(b"====", encoded=True)
     check_decode(b"eA===", encoded=True)
     check_decode(b"eHk==", encoded=True)
-    check_decode(b"eA==x", encoded=True)
-    check_decode(b"eHk=x", encoded=True)
-    check_decode(b"eA==abc=======efg", encoded=True)
+    # TODO: behavior in these cases changed in Python 3.14.4, we should match that.
+    # check_decode(b"eA==x", encoded=True)
+    # check_decode(b"eHk=x", encoded=True)
+    # check_decode(b"eA==abc=======efg", encoded=True)
 
 def test_decode_wrappers() -> None:
     funcs: list[Any] = [b64decode, urlsafe_b64decode]

pyproject.toml

@@ -64,7 +64,7 @@ python2 = []
 reports = ["lxml"]
 install-types = ["pip"]
 faster-cache = ["orjson"]
-native-parser = ["ast-serialize>=0.1.1,<1.0.0"]
+native-parser = ["ast-serialize>=0.1.2,<1.0.0"]
 
 [project.urls]
 Homepage = "https://www.mypy-lang.org/"

test-data/unit/check-statements.test

@@ -851,9 +851,7 @@ def error_in_tuple_union(exc: Tuple[Union[Type[E1], Type[E2]], Union[Type[E3], i
         pass
 [builtins fixtures/tuple.pyi]
 
-[case testExceptWithMultipleTypes6_no_parallel]
-# For no_parallel, see:
-# https://github.com/mypyc/ast_serialize/issues/50
+[case testExceptWithMultipleTypes6]
 from typing import Never
 
 def random() -> bool: ...

test-requirements.in

@@ -13,4 +13,4 @@ pytest-cov>=2.10.0
 setuptools>=77.0.3
 tomli>=1.1.0  # needed even on py311+ so the self check passes with --python-version 3.10
 pre_commit>=3.5.0
-ast-serialize>=0.1.1,<1.0.0
+ast-serialize>=0.1.2,<1.0.0

test-requirements.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --allow-unsafe --output-file=test-requirements.txt --strip-extras test-requirements.in
 #
-ast-serialize==0.1.1
+ast-serialize==0.1.2
     # via -r test-requirements.in
 attrs==25.4.0
     # via -r test-requirements.in