Merge branch 'main' into assign-required-fields

Author: DanielNoord

.pre-commit-config.yaml

@@ -63,14 +63,7 @@ repos:
         types: [python]
         args: []
         require_serial: true
-        additional_dependencies:
-          [
-            "types-pkg_resources==0.1.3",
-            "types-six",
-            "types-attrs",
-            "types-python-dateutil",
-            "types-typed-ast",
-          ]
+        additional_dependencies: ["types-typed-ast"]
         exclude: tests/testdata| # exclude everything, we're not ready
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.0-alpha.6

ChangeLog

@@ -12,6 +12,7 @@ Release date: TBA
 
 * Improved signature of the ``__init__`` and ``__postinit__`` methods of the following nodes:
   - ``nodes.Assign``
+  - ``nodes.Delete``
   - ``nodes.If``
   - ``nodes.IfExp``
 

astroid/nodes/node_classes.py

@@ -2238,26 +2238,13 @@ class Delete(_base_nodes.AssignTypeNode, _base_nodes.Statement):
 
     def __init__(
         self,
-        lineno: int | None = None,
-        col_offset: int | None = None,
-        parent: NodeNG | None = None,
+        lineno: int,
+        col_offset: int,
+        parent: NodeNG,
         *,
-        end_lineno: int | None = None,
-        end_col_offset: int | None = None,
+        end_lineno: int | None,
+        end_col_offset: int | None,
     ) -> None:
-        """
-        :param lineno: The line that this node appears on in the source code.
-
-        :param col_offset: The column that this node appears on in the
-            source code.
-
-        :param parent: The parent node in the syntax tree.
-
-        :param end_lineno: The last line this node appears on in the source code.
-
-        :param end_col_offset: The end column this node appears on in the
-            source code. Note: This is after the last symbol.
-        """
         self.targets: list[NodeNG] = []
         """What is being deleted."""
 
@@ -2269,13 +2256,8 @@ def __init__(
             parent=parent,
         )
 
-    def postinit(self, targets: list[NodeNG] | None = None) -> None:
-        """Do some setup after initialisation.
-
-        :param targets: What is being deleted.
-        """
-        if targets is not None:
-            self.targets = targets
+    def postinit(self, targets: list[NodeNG]) -> None:
+        self.targets = targets
 
     def get_children(self):
         yield from self.targets

requirements_test.txt

@@ -3,4 +3,3 @@
 contributors-txt>=0.7.4
 tbump~=6.9.0
 types-typed-ast; implementation_name=="cpython" and python_version<"3.8"
-types-pkg_resources==0.1.3

requirements_test_brain.txt

@@ -1,12 +1,9 @@
 attrs
-types-attrs
 nose
 numpy>=1.17.0; python_version<"3.11"
 python-dateutil
 PyQt6
 regex
-types-python-dateutil
 six
-types-six
 urllib3
 typing_extensions>=4.4.0

tests/brain/test_attr.py

@@ -10,7 +10,7 @@
 from astroid import nodes
 
 try:
-    import attr as attr_module  # pylint: disable=unused-import
+    import attr  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_ATTR = True
 except ImportError:

tests/brain/test_dateutil.py

@@ -9,7 +9,7 @@
 from astroid import builder
 
 try:
-    import dateutil  # pylint: disable=unused-import
+    import dateutil  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_DATEUTIL = True
 except ImportError:

tests/brain/test_regex.py

@@ -3,7 +3,7 @@
 # Copyright (c) https://github.com/pylint-dev/astroid/blob/main/CONTRIBUTORS.txt
 
 try:
-    import regex
+    import regex  # type: ignore[import]
 
     HAS_REGEX = True
 except ImportError:

tests/brain/test_six.py

@@ -12,7 +12,7 @@
 from astroid.nodes.scoped_nodes import ClassDef
 
 try:
-    import six  # pylint: disable=unused-import
+    import six  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_SIX = True
 except ImportError:

tests/test_inference.py

@@ -36,7 +36,7 @@
 from . import resources
 
 try:
-    import six  # pylint: disable=unused-import
+    import six  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_SIX = True
 except ImportError:

tests/test_modutils.py

@@ -26,7 +26,7 @@
 from . import resources
 
 try:
-    import urllib3  # pylint: disable=unused-import
+    import urllib3  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_URLLIB3 = True
 except ImportError:

tests/test_object_model.py

@@ -13,7 +13,7 @@
 from astroid.exceptions import InferenceError
 
 try:
-    import six  # pylint: disable=unused-import
+    import six  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_SIX = True
 except ImportError:

tests/test_scoped_nodes.py

@@ -47,7 +47,7 @@
 from . import resources
 
 try:
-    import six  # pylint: disable=unused-import
+    import six  # type: ignore[import]  # pylint: disable=unused-import
 
     HAS_SIX = True
 except ImportError: