Fix some pyright errors.

Author: shyuep

src/pymatgen/analysis/adsorption.py

@@ -22,7 +22,7 @@
 from pymatgen.util.coord import in_coord_list_pbc
 
 if TYPE_CHECKING:
-    import matplotlib.pyplot as plt
+    from matplotlib.axes import Axes
     from numpy.typing import ArrayLike
     from typing_extensions import Self
 
@@ -636,7 +636,7 @@ def reorient_z(structure):
 
 def plot_slab(
     slab: Slab,
-    ax: plt.Axes,
+    ax: Axes,
     scale=0.8,
     repeat=5,
     window=1.5,

src/pymatgen/analysis/chemenv/connectivity/structure_connectivity.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import collections
+import collections.abc
 import logging
 from typing import TYPE_CHECKING
 

src/pymatgen/analysis/chemenv/coordination_environments/structure_environments.py

@@ -26,6 +26,8 @@
 from pymatgen.core import Element, PeriodicNeighbor, PeriodicSite, Species, Structure
 
 if TYPE_CHECKING:
+    from matplotlib.axes import Axes
+    from matplotlib.figure import Figure
     from typing_extensions import Self
 
 __author__ = "David Waroquiers"
@@ -654,7 +656,7 @@ def plot_csm_and_maps(self, isite, max_csm=8.0):
 
     def get_csm_and_maps(
         self, isite, max_csm=8.0, figsize=None, symmetry_measure_type=None
-    ) -> tuple[plt.Figure, plt.Axes] | None:
+    ) -> tuple[Figure, Axes] | None:
         """
         Plotting of the coordination numbers of a given site for all the distfactor/angfactor parameters. If the
         chemical environments are given, a color map is added to the plot, with the lowest continuous symmetry measure
@@ -813,7 +815,7 @@ def get_environments_figure(
             strategy: Whether to plot information about one of the Chemenv Strategies.
 
         Returns:
-            tuple[plt.Figure, plt.Axes]: matplotlib figure and axes representing the environments.
+            tuple[Figure, Axes]: matplotlib figure and axes representing the environments.
         """
         # Initializes the figure
         fig = plt.figure(figsize=figsize)

src/pymatgen/analysis/diffraction/core.py

@@ -13,6 +13,8 @@
 from pymatgen.util.plotting import add_fig_kwargs, pretty_plot
 
 if TYPE_CHECKING:
+    from matplotlib.axes import Axes
+
     from pymatgen.core import Structure
 
 
@@ -77,10 +79,10 @@ def get_plot(
         structure: Structure,
         two_theta_range: tuple[float, float] = (0, 90),
         annotate_peaks="compact",
-        ax: plt.Axes = None,
+        ax: Axes = None,
         with_labels=True,
         fontsize=16,
-    ) -> plt.Axes:
+    ) -> Axes:
         """Get the diffraction plot as a matplotlib Axes.
 
         Args:

src/pymatgen/analysis/elasticity/strain.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import collections
+import collections.abc
 import itertools
 from typing import TYPE_CHECKING
 

src/pymatgen/analysis/eos.py

@@ -28,6 +28,7 @@
     from typing import Any, ClassVar
 
     import matplotlib.pyplot as plt
+    from matplotlib.axes import Axes
 
 __author__ = "Kiran Mathew, gmatteo"
 __credits__ = "Cormac Toher"
@@ -175,10 +176,10 @@ def plot(
         self,
         width: float = 8,
         height: float | None = None,
-        ax: plt.Axes = None,
+        ax: Axes = None,
         dpi: float | None = None,
         **kwargs,
-    ) -> plt.Axes:
+    ) -> Axes:
         """
         Plot the equation of state.
 
@@ -231,7 +232,7 @@ def plot(
     @add_fig_kwargs
     def plot_ax(
         self,
-        ax: plt.Axes | None = None,
+        ax: Axes | None = None,
         fontsize: float = 12,
         **kwargs,
     ) -> plt.Figure:

src/pymatgen/core/composition.py

@@ -5,6 +5,7 @@
 from __future__ import annotations
 
 import collections
+import collections.abc
 import math
 import os
 import re

src/pymatgen/core/sites.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import collections
+import collections.abc
 import json
 import warnings
 from typing import TYPE_CHECKING, cast

src/pymatgen/core/structure.py

@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 import collections
+import collections.abc
 import contextlib
 import functools
 import inspect

src/pymatgen/core/tensors.py

@@ -6,6 +6,7 @@
 from __future__ import annotations
 
 import collections
+import collections.abc
 import itertools
 import logging
 import os