Add compatibility with astroid inference cache changes

doc/requirements.txt

@@ -3,3 +3,4 @@ sphinx-reredirects<1
 towncrier~=23.6
 furo==2023.5.20
 -e .
+astroid @ git+https://github.com/pylint-dev/pylint.git@cf8763a2b8e897ec7c8389906f3cb13714300cd2

pylint/checkers/typecheck.py

@@ -1899,16 +1899,13 @@ def visit_with(self, node: nodes.With) -> None:
 
                 # Retrieve node from all previously visited nodes in the
                 # inference history
-                context_path_names: Iterator[Any] = filter(
-                    None, _unflatten(context.path)
-                )
-                inferred_paths = _flatten_container(
-                    safe_infer(path) for path in context_path_names
-                )
-                for inferred_path in inferred_paths:
+                for inferred_path, _ in context.path:
                     if not inferred_path:
                         continue
-                    scope = inferred_path.scope()
+                    if isinstance(inferred_path, nodes.Call):
+                        scope = safe_infer(inferred_path.func)
+                    else:
+                        scope = inferred_path.scope()
                     if not isinstance(scope, nodes.FunctionDef):
                         continue
                     if decorated_with(

pylint/checkers/utils.py

@@ -1471,7 +1471,7 @@ def node_type(node: nodes.NodeNG) -> SuccessfulInferenceResult | None:
     # don't handle it for now
     types: set[SuccessfulInferenceResult] = set()
     try:
-        for var_type in node.infer():
+        for var_type in node.infer(context=InferenceContext()):
             if isinstance(var_type, util.UninferableBase) or is_none(var_type):
                 continue
             types.add(var_type)

pyproject.toml

@@ -41,7 +41,7 @@ dependencies    = [
     # Also upgrade requirements_test_min.txt.
     # Pinned to dev of second minor update to allow editable installs and fix primer issues,
     # see https://github.com/pylint-dev/astroid/issues/1341
-    "astroid>=3.0.0a8,<=3.1.0-dev0",
+    "astroid @ git+https://github.com/pylint-dev/pylint.git@cf8763a2b8e897ec7c8389906f3cb13714300cd2",
     "isort>=4.2.5,<6",
     "mccabe>=0.6,<0.8",
     "tomli>=1.1.0;python_version<'3.11'",

requirements_test_min.txt

@@ -1,6 +1,6 @@
 -e .[testutils,spelling]
 # astroid dependency is also defined in pyproject.toml
-astroid==3.0.0a8  # Pinned to a specific version for tests
+astroid @ git+https://github.com/pylint-dev/pylint.git@cf8763a2b8e897ec7c8389906f3cb13714300cd2
 typing-extensions~=4.7
 py~=1.11.0
 pytest~=7.4