Merge branch 'main' into Update-isort-and-black-in-run_formatters-script-to-Ruff

Author: Avasam

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
           python-version: "3.11"
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}

stubs/matplotlib/transforms.pyi

@@ -26,7 +26,6 @@ class TransformNode:
 class BboxBase(TransformNode):
     is_bbox = ...
     is_affine = ...
-    if DEBUG: ...
 
     def frozen(self): ...
     def __array__(self, *args, **kwargs): ...

stubs/networkx/algorithms/isomorphism/matchhelpers.pyi

@@ -31,11 +31,7 @@ categorical_edge_match = ...
 def categorical_multiedge_match(attr: str | ArrayLike, default): ...
 
 # Docstrings for categorical functions.
-categorical_node_match.__doc__ = ...
-categorical_edge_match.__doc__ = ...
 tmpdoc = ...
-tmpdoc = ...
-categorical_multiedge_match.__doc__ = ...
 
 numerical_doc: str = ...
 
@@ -56,11 +52,7 @@ def numerical_multiedge_match(
 ): ...
 
 # Docstrings for numerical functions.
-numerical_node_match.__doc__ = ...
-numerical_edge_match.__doc__ = ...
-tmpdoc = ...
 tmpdoc = ...
-numerical_multiedge_match.__doc__ = ...
 
 generic_doc: str = ...
 
@@ -69,7 +61,3 @@ def generic_node_match(attr: str | ArrayLike, default, op: ArrayLike | Callable)
 generic_edge_match = ...
 
 def generic_multiedge_match(attr: str | ArrayLike, default, op: ArrayLike | Callable): ...
-
-# Docstrings for numerical functions.
-generic_node_match.__doc__ = ...
-generic_edge_match.__doc__ = ...

stubs/networkx/algorithms/tree/branchings.pyi

@@ -112,14 +112,6 @@ docstring_branching: str = ...
 
 docstring_arborescence = ...
 
-maximum_branching.__doc__ = ...
-
-minimum_branching.__doc__ = ...
-
-maximum_spanning_arborescence.__doc__ = ...
-
-minimum_spanning_arborescence.__doc__ = ...
-
 class ArborescenceIterator:
     def __init__(
         self,

stubs/networkx/classes/digraph.pyi

@@ -51,9 +51,6 @@ class DiGraph(Graph):
     # alias out_edges to edges
     @cached_property
     def out_edges(self) -> OutEdgeView: ...
-
-    out_edges.__doc__ = ...
-
     @cached_property
     def in_edges(self) -> InEdgeView: ...
     @cached_property

stubs/networkx/classes/multidigraph.pyi

@@ -33,9 +33,6 @@ class MultiDiGraph(MultiGraph, DiGraph):
     # alias out_edges to edges
     @cached_property
     def out_edges(self) -> OutMultiEdgeView: ...
-
-    out_edges.__doc__ = ...
-
     @cached_property
     def in_edges(self) -> InMultiEdgeView: ...
     @cached_property

stubs/networkx/readwrite/gexf.pyi

@@ -12,11 +12,7 @@ def generate_gexf(G: Graph, encoding="utf-8", prettyprint=True, version="1.2draf
 def read_gexf(path, node_type=None, relabel=False, version="1.2draft"): ...
 
 class GEXF:
-    versions: dict = ...
-    d: dict = ...
-    versions["1.1draft"] = ...
-    d: dict = ...
-    versions["1.2draft"] = ...
+    versions: dict
 
     def construct_types(self): ...
 

stubs/skimage/__init__.pyi

@@ -6,7 +6,8 @@ from ._shared import lazy as lazy
 from ._shared.tester import PytestTester as PytestTester  # noqa
 from ._shared.version_requirements import ensure_python_version as ensure_python_version
 
-__getattr__, __lazy_dir__, _ = ...
+__getattr__ = ...
+__lazy_dir__ = ...
 
 def __dir__(): ...
 

stubs/skimage/data/__init__.pyi

@@ -1,3 +1,5 @@
 from .._shared import lazy as lazy
 
-__getattr__, __dir__, __all__ = ...
+__getattr__ = ...
+__dir__ = ...
+__all__ = ...  # pyright: ignore[reportUnsupportedDunderAll] # TODO

stubs/skimage/data/_fetchers.pyi

@@ -15,7 +15,8 @@ skimage_distribution_dir = ...
 def _has_hash(path, expected_hash): ...
 def create_image_fetcher(): ...
 
-image_fetcher, data_dir = ...
+image_fetcher = ...
+data_dir = ...
 
 def _skip_pytest_case_requiring_pooch(data_filename): ...
 def _fetch(data_filename): ...