Review comments from Qulogic

ksunden · ksunden · commit bd4469d1e4ee · 2023-03-30T12:45:28.000-05:00
Includes completion of rebase onto #25580, fixing type hint
diff --git a/.github/workflows/mypy-stubtest.yml b/.github/workflows/mypy-stubtest.yml
@@ -25,7 +25,6 @@ jobs:
 
       - name: Run mypy stubtest
         run: |
-          set -o pipefail
           # the ignore missing imports can be removed when typed cycler is released and used
           MPLBACKEND=agg python -m mypy.stubtest matplotlib --mypy-config-file pyproject.toml \
                                 --allowlist ci/mypy-stubtest-allowlist.txt
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -65,7 +65,7 @@ jobs:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -o pipefail
-          # the ignore missing imports can be removed when typed cycler is released and used
+          # The --ignore-missing-imports can be removed when typed cycler is released and used
           mypy --config pyproject.toml lib/matplotlib \
              --ignore-missing-imports \
              --follow-imports silent | \
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -111,6 +111,7 @@
     "get_cachedir",
     "get_data_path",
     "matplotlib_fname",
+    "MatplotlibDeprecationWarning",
     "RcParams",
     "rc_params",
     "rc_params_from_file",
diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
@@ -8,6 +8,7 @@ __all__ = [
     "get_cachedir",
     "get_data_path",
     "matplotlib_fname",
+    "MatplotlibDeprecationWarning",
     "RcParams",
     "rc_params",
     "rc_params_from_file",
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -90,11 +90,10 @@
 
     from numpy.typing import ArrayLike
     from typing import (
-        Any, Callable, Literal, Sequence, Iterable, Type, Generator
+        Any, Callable, Hashable, Literal, Sequence, Iterable, Type, Generator
     )
 
     from matplotlib.axis import Tick
-    from matplotlib.axes import SubplotBase
     from matplotlib.axes._base import _AxesBase
     from matplotlib.backend_bases import RendererBase, Event
     from matplotlib.cm import ScalarMappable
@@ -1578,9 +1577,9 @@ def subplot_mosaic(
     empty_sentinel: Any = '.',
     subplot_kw: dict[str, Any] | None = None,
     gridspec_kw: dict[str, Any] | None = None,
-    per_subplot_kw: dict[Any, dict[str, Any]] | None = None,
+    per_subplot_kw: dict[Hashable, dict[str, Any]] | None = None,
     **fig_kw
-) -> tuple[Figure, dict[Any, matplotlib.axes.Axes]]:
+) -> tuple[Figure, dict[Hashable, matplotlib.axes.Axes]]:
     """
     Build a layout of Axes based on ASCII art or nested lists.
 
@@ -2189,7 +2188,7 @@ def thetagrids(
 
 
 @_api.deprecated("3.7", pending=True)
-def get_plot_commands() -> Generator[str, None, None]:
+def get_plot_commands() -> list[str]:
     """
     Get a sorted list of all of the plotting commands.
     """
diff --git a/requirements/testing/mypy.txt b/requirements/testing/mypy.txt
@@ -1,4 +1,4 @@
-# Extra pip requirements for the GitHub Actions flake8 build
+# Extra pip requirements for the GitHub Actions mypy build
 
 mypy
 
diff --git a/tools/check_typehints.py b/tools/check_typehints.py
@@ -28,7 +28,7 @@
   - Inheritance makes the set arithmetic harder when only loading AST
   - Attributes also make it more complicated when defined in init
 - Functions type hinted with ``overload`` are ignored for argument checking
-  - Usually this means the implementation is is less strict in signature but will raise
+  - Usually this means the implementation is less strict in signature but will raise
     if an invalid signature is used, type checking allows such errors to be caught by
     the type checker instead of at runtime.
 - Private attribute/functions are ignored

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Extra pip requirements for the GitHub Actions flake8 build`
	`1`	`+# Extra pip requirements for the GitHub Actions mypy build`
`2`	`2`
`3`	`3`	`mypy`
`4`	`4`