Address CR; one more missing wrap_context()

Author: ilevkivskyi

mypy/build.py

@@ -959,7 +959,8 @@ def parse_all(self, states: Iterable[State]) -> None:
         if self.options.native_parser:
             futures = []
             parsed_states = set()
-            available_threads = get_available_threads()
+            # Use at least --num-threads if specified by user.
+            available_threads = max(get_available_threads(), self.options.num_workers)
             # Overhead from trying to parallelize (small) blocking portion of
             # parse_file_inner() results in no visible improvement with more than 8 threads.
             with ThreadPoolExecutor(max_workers=min(available_threads, 8)) as executor:

mypy/semanal_main.py

@@ -525,7 +525,10 @@ def calculate_class_properties(graph: Graph, scc: list[str], errors: Errors) ->
         assert tree
         for _, node, _ in tree.local_definitions():
             if isinstance(node.node, TypeInfo):
-                with state.manager.semantic_analyzer.file_context(tree, state.options, node.node):
+                with (
+                    state.wrap_context(),
+                    state.manager.semantic_analyzer.file_context(tree, state.options, node.node),
+                ):
                     calculate_class_abstract_status(node.node, tree.is_stub, errors)
                     check_protocol_status(node.node, errors)
                     calculate_class_vars(node.node)

mypy/util.py

@@ -992,18 +992,15 @@ def get_available_threads() -> int:
         cpu_count = psutil_cpu_count or os_cpu_count
     else:
         # A conservative fallback in case we cannot determine CPU count in any way.
-        cpu_count = 2
+        cpu_count = 4
 
     affinity = None
     # Not available on old Python versions on some platforms.
     if sys.platform == "linux":
         affinity = os.sched_getaffinity(0)
-    if PSUTIL_AVAILABLE:
-        try:
-            # Currently not supported on macOS.
-            affinity = psutil.Process().cpu_affinity()
-        except AttributeError:
-            pass
+    if PSUTIL_AVAILABLE and sys.platform != "darwin":
+        # Currently not supported on macOS.
+        affinity = psutil.Process().cpu_affinity()
 
     assert cpu_count is not None
     if affinity: