Enable more ruff rules including A, DTZ, PGH and more

dev_scripts/chemenv/get_plane_permutations_optimized.py

@@ -236,7 +236,7 @@ def random_permutations_iterator(initial_permutation, n_permutations):
                 sym_measures = [c["symmetry_measure"] for c in csms]
                 prt1(string="Continuous symmetry measures", printing_volume=printing_volume)
                 prt1(string=sym_measures, printing_volume=printing_volume)
-                csms_with_recorded_permutation = []  # type: ignore
+                csms_with_recorded_permutation: list = []
                 explicit_permutations = []
                 for icsm, csm in enumerate(csms):
                     found = False
@@ -308,7 +308,6 @@ def random_permutations_iterator(initial_permutation, n_permutations):
                 all_planes_point_indices += algo.other_plane_points
 
             # Setup of the permutations to be used for this algorithm
-
             indices = list(range(cg.coordination_number))
             if permutations_setup_type == "all":
                 perms_iterator = itertools.permutations(indices)
@@ -400,7 +399,8 @@ def random_permutations_iterator(initial_permutation, n_permutations):
                     else:
                         perms_used[some_perm] = 1
                 tcurrent = time.process_time()
-                time_left = (n_permutations - idx_perm) * (tcurrent - t0) / idx_perm  # type: ignore
+                assert n_permutations is not None
+                time_left = (n_permutations - idx_perm) * (tcurrent - t0) / idx_perm
                 time_left = f"{time_left:.1f}"
                 idx_perm += 1
             print(

dev_scripts/update_pt_data.py

@@ -30,24 +30,24 @@ def parse_oxi_state():
     oxi_data = re.sub("[\n\r]", "", oxi_data)
     patt = re.compile("<tr>(.*?)</tr>", re.MULTILINE)
 
-    for m in patt.finditer(oxi_data):
-        line = m.group(1)
+    for match in patt.finditer(oxi_data):
+        line = match[1]
         line = re.sub("</td>", "", line)
         line = re.sub("(<td>)+", "<td>", line)
         line = re.sub("</*a[^>]*>", "", line)
         el = None
         oxi_states = []
         common_oxi = []
         for tok in re.split("<td>", line.strip()):
-            m2 = re.match(r"<b>([A-Z][a-z]*)</b>", tok)
-            if m2:
-                el = m2.group(1)
+            match2 = re.match(r"<b>([A-Z][a-z]*)</b>", tok)
+            if match2:
+                el = match2[1]
             else:
-                m3 = re.match(r"(<b>)*([\+\-]\d)(</b>)*", tok)
-                if m3:
-                    oxi_states += [int(m3.group(2))]
-                    if m3.group(1):
-                        common_oxi += [int(m3.group(2))]
+                match3 = re.match(r"(<b>)*([\+\-]\d)(</b>)*", tok)
+                if match3:
+                    oxi_states += [int(match3[2])]
+                    if match3[1]:
+                        common_oxi += [int(match3[2])]
         if el in data:
             del data[el]["Max oxidation state"]
             del data[el]["Min oxidation state"]
@@ -79,7 +79,7 @@ def parse_ionic_radii():
         ionic_radii = {}
         for tok_idx in range(3, len(tokens)):
             if match := re.match(r"^\s*([0-9\.]+)", tokens[tok_idx]):
-                ionic_radii[int(header[tok_idx])] = float(match.group(1))
+                ionic_radii[int(header[tok_idx])] = float(match[1])
 
         if el in data:
             data[el][f"Ionic_radii{suffix}"] = ionic_radii

pymatgen/alchemy/filters.py

@@ -179,7 +179,7 @@ def __init__(self, structure_matcher: dict | StructureMatcher | None = None, sym
         self.symprec = symprec
         self.structure_list: dict[str, list[Structure]] = defaultdict(list)
         if not isinstance(structure_matcher, (dict, StructureMatcher, type(None))):
-            raise ValueError(f"{structure_matcher=} must be a dict, StructureMatcher or None")
+            raise TypeError(f"{structure_matcher=} must be a dict, StructureMatcher or None")
         if isinstance(structure_matcher, dict):
             self.structure_matcher = StructureMatcher.from_dict(structure_matcher)
         else:

pymatgen/alchemy/materials.py

@@ -270,10 +270,10 @@ def from_cif_str(
         primitive: bool = True,
         occupancy_tolerance: float = 1.0,
     ) -> Self:
-        """Generate TransformedStructure from a cif string.
+        """Generate TransformedStructure from a CIF string.
 
         Args:
-            cif_string (str): Input cif string. Should contain only one
+            cif_string (str): Input CIF string. Should contain only one
                 structure. For CIFs containing multiple structures, please use
                 CifTransmuter.
             transformations (list[Transformation]): Sequence of transformations
@@ -302,7 +302,7 @@ def from_cif_str(
             source = "uploaded cif"
         source_info = {
             "source": source,
-            "datetime": str(datetime.datetime.now()),
+            "datetime": str(datetime.datetime.now(tz=datetime.timezone.utc)),
             "original_file": raw_str,
             "cif_data": cif_dict[cif_keys[0]],
         }
@@ -330,7 +330,7 @@ def from_poscar_str(
         struct = poscar.structure
         source_info = {
             "source": "POSCAR",
-            "datetime": str(datetime.datetime.now()),
+            "datetime": str(datetime.datetime.now(tz=datetime.timezone.utc)),
             "original_file": raw_str,
         }
         return cls(struct, transformations, history=[source_info])

pymatgen/alchemy/transmuters.py

@@ -121,10 +121,10 @@ def append_transformation(self, transformation, extend_collection=False, clear_r
                 describes whether the transformation altered the structure
         """
         if self.ncores and transformation.use_multiprocessing:
-            with Pool(self.ncores) as p:
+            with Pool(self.ncores) as pool:
                 # need to condense arguments into single tuple to use map
                 z = ((ts, transformation, extend_collection, clear_redo) for ts in self.transformed_structures)
-                trafo_new_structs = p.map(_apply_transformation, z, 1)
+                trafo_new_structs = pool.map(_apply_transformation, z, 1)
                 self.transformed_structures = []
                 for ts in trafo_new_structs:
                     self.transformed_structures.extend(ts)
@@ -223,19 +223,17 @@ def from_structures(cls, structures, transformations=None, extend_collection=0)
 
 
 class CifTransmuter(StandardTransmuter):
-    """Generate a Transmuter from a cif string, possibly containing multiple
-    structures.
-    """
+    """Generate a Transmuter from a CIF string, possibly containing multiple structures."""
 
     def __init__(self, cif_string, transformations=None, primitive=True, extend_collection=False):
-        """Generate a Transmuter from a cif string, possibly
+        """Generate a Transmuter from a CIF string, possibly
         containing multiple structures.
 
         Args:
-            cif_string: A string containing a cif or a series of CIFs
+            cif_string: A string containing a CIF or a series of CIFs
             transformations: New transformations to be applied to all
                 structures
-            primitive: Whether to generate the primitive cell from the cif.
+            primitive: Whether to generate the primitive cell from the CIF.
             extend_collection: Whether to use more than one output structure
                 from one-to-many transformations. extend_collection can be a
                 number, which determines the maximum branching for each
@@ -262,7 +260,7 @@ def from_filenames(cls, filenames, transformations=None, primitive=True, extend_
         containing multiple structures.
 
         Args:
-            filenames: List of strings of the cif files
+            filenames: List of strings of the CIF files
             transformations: New transformations to be applied to all
                 structures
             primitive: Same meaning as in __init__.

pymatgen/analysis/chemenv/connectivity/connected_components.py

@@ -483,7 +483,7 @@ def compute_periodicity_cycle_basis(self) -> None:
                     for current_delta in this_cycle_deltas:
                         this_cycle_deltas_new.append(current_delta + delta)
                 this_cycle_deltas = this_cycle_deltas_new
-            all_deltas.extend(this_cycle_deltas)  # type: ignore
+            all_deltas.extend(this_cycle_deltas)
             all_deltas = get_linearly_independent_vectors(all_deltas)
             if len(all_deltas) == 3:
                 return
@@ -501,7 +501,7 @@ def compute_periodicity_cycle_basis(self) -> None:
                     current_delta = get_delta(n1, n2, e1data)
                     delta = get_delta(n2, n1, e2data)
                     current_delta += delta
-                    all_deltas.append(current_delta)  # type: ignore
+                    all_deltas.append(current_delta)
             else:
                 raise ValueError("Should not be here ...")
             all_deltas = get_linearly_independent_vectors(all_deltas)
@@ -770,7 +770,7 @@ def _edgedictkey_to_edgekey(key):
             except ValueError:
                 return key
         else:
-            raise ValueError("Edge key in a dict of dicts representation of a graph should be either a str or an int.")
+            raise TypeError("Edge key in a dict of dicts representation of a graph should be either a str or an int.")
 
     @staticmethod
     def _retuplify_edgedata(edata):

pymatgen/analysis/chemenv/coordination_environments/chemenv_strategies.py

@@ -236,7 +236,7 @@ def set_structure_environments(self, structure_environments):
         """
         self.structure_environments = structure_environments
         if not isinstance(self.structure_environments.voronoi, DetailedVoronoiContainer):
-            raise ValueError('Voronoi Container not of type "DetailedVoronoiContainer"')
+            raise TypeError('Voronoi Container not of type "DetailedVoronoiContainer"')
         self.prepare_symmetries()
 
     def prepare_symmetries(self):
@@ -512,7 +512,7 @@ class SimplestChemenvStrategy(AbstractChemenvStrategy):
     DEFAULT_ANGLE_CUTOFF = 0.3
     DEFAULT_CONTINUOUS_SYMMETRY_MEASURE_CUTOFF = 10
     DEFAULT_ADDITIONAL_CONDITION = AbstractChemenvStrategy.AC.ONLY_ACB
-    STRATEGY_OPTIONS: ClassVar[dict[str, dict]] = dict(  # type: ignore
+    STRATEGY_OPTIONS: ClassVar[dict[str, dict]] = dict(
         distance_cutoff=dict(
             type=DistanceCutoffFloat,
             internal="_distance_cutoff",
@@ -598,7 +598,7 @@ def angle_cutoff(self, angle_cutoff):
         self._angle_cutoff = AngleCutoffFloat(angle_cutoff)
 
     @property
-    def additional_condition(self):
+    def additional_condition(self) -> AdditionalConditionInt:
         """Additional condition for this strategy."""
         return self._additional_condition
 
@@ -897,7 +897,7 @@ class SimpleAbundanceChemenvStrategy(AbstractChemenvStrategy):
 
     DEFAULT_MAX_DIST = 2.0
     DEFAULT_ADDITIONAL_CONDITION = AbstractChemenvStrategy.AC.ONLY_ACB
-    STRATEGY_OPTIONS: ClassVar[dict[str, dict]] = dict(  # type: ignore
+    STRATEGY_OPTIONS: ClassVar[dict[str, dict]] = dict(
         surface_calculation_type={},
         additional_condition=dict(
             type=AdditionalConditionInt,
@@ -1057,7 +1057,7 @@ def __eq__(self, other: object) -> bool:
         if not isinstance(other, type(self)):
             return NotImplemented
 
-        return self._additional_condition == other.additional_condition  # type: ignore
+        return self._additional_condition == other.additional_condition  # type: ignore[has-type]
 
     def as_dict(self):
         """
@@ -1347,7 +1347,7 @@ def angle_sumn(self, nb_set):
     def __eq__(self, other: object) -> bool:
         if not hasattr(other, "aa"):
             return NotImplemented
-        return self.aa == other.aa  # type: ignore
+        return self.aa == other.aa
 
     def as_dict(self):
         """MSONable dict."""

pymatgen/analysis/chemenv/coordination_environments/coordination_geometries.py

@@ -767,7 +767,7 @@ def faces(self, sites, permutation=None):
         coords = [site.coords for site in sites] if permutation is None else [sites[ii].coords for ii in permutation]
         return [[coords[ii] for ii in face] for face in self._faces]
 
-    def edges(self, sites, permutation=None, input="sites"):
+    def edges(self, sites, permutation=None, input="sites"):  # noqa: A002
         """Get the list of edges of this coordination geometry. Each edge is given as a
         list of its end vertices coordinates.
         """
@@ -1144,7 +1144,7 @@ def is_a_valid_coordination_geometry(
         # TODO give a more helpful error message that suggests possible reasons and solutions
         raise RuntimeError("Should not be here!")
 
-    def pretty_print(self, type="implemented_geometries", maxcn=8, additional_info=None):
+    def pretty_print(self, type="implemented_geometries", maxcn=8, additional_info=None):  # noqa: A002
         """Get a string with a list of the Coordination Geometries.
 
         Args:

pymatgen/analysis/chemenv/utils/scripts_utils.py

@@ -3,11 +3,11 @@
 from __future__ import annotations
 
 import re
+from typing import TYPE_CHECKING
 
 import numpy as np
 
 from pymatgen.analysis.chemenv.coordination_environments.chemenv_strategies import (
-    AbstractChemenvStrategy,
     SimpleAbundanceChemenvStrategy,
     SimplestChemenvStrategy,
     TargetedPenaltiedAbundanceChemenvStrategy,
@@ -32,6 +32,9 @@
 except ImportError:
     StructureVis = None  # type: ignore[misc]
 
+if TYPE_CHECKING:
+    from typing import Any
+
 __author__ = "David Waroquiers"
 __copyright__ = "Copyright 2012, The Materials Project"
 __credits__ = "Geoffroy Hautier"
@@ -40,10 +43,10 @@
 __email__ = "david.waroquiers@gmail.com"
 __date__ = "Feb 20, 2016"
 
-strategies_class_lookup: dict[str, AbstractChemenvStrategy] = {
-    "SimplestChemenvStrategy": SimplestChemenvStrategy,  # type: ignore
-    "SimpleAbundanceChemenvStrategy": SimpleAbundanceChemenvStrategy,  # type: ignore
-    "TargetedPenaltiedAbundanceChemenvStrategy": TargetedPenaltiedAbundanceChemenvStrategy,  # type: ignore
+strategies_class_lookup: dict[str, Any] = {
+    "SimplestChemenvStrategy": SimplestChemenvStrategy,
+    "SimpleAbundanceChemenvStrategy": SimpleAbundanceChemenvStrategy,
+    "TargetedPenaltiedAbundanceChemenvStrategy": TargetedPenaltiedAbundanceChemenvStrategy,
 }
 
 

pymatgen/analysis/chempot_diagram.py

@@ -187,7 +187,7 @@ def get_plot(
                 default_min_limit=self.default_min_limit,
                 formal_chempots=self.formal_chempots,
             )
-            fig = cpd.get_plot(elements=elems, label_stable=label_stable)  # type: ignore
+            fig = cpd.get_plot(elements=elems, label_stable=label_stable)  # type: ignore[arg-type]
         else:
             fig = self._get_3d_plot(
                 elements=elems,
@@ -211,7 +211,7 @@ def _get_domains(self) -> dict[str, np.ndarray]:
         interior_point = np.min(self.lims, axis=1) + 1e-1
         hs_int = HalfspaceIntersection(hs_hyperplanes, interior_point)
 
-        domains = {entry.reduced_formula: [] for entry in entries}  # type: ignore
+        domains: dict[str, list] = {entry.reduced_formula: [] for entry in entries}
 
         for intersection, facet in zip(hs_int.intersections, hs_int.dual_facets):
             for v in facet:
@@ -585,7 +585,7 @@ def get_chempot_axis_title(element) -> str:
 
         return axes_layout
 
-    @property  # type: ignore
+    @property
     @lru_cache(maxsize=1)  # noqa: B019
     def domains(self) -> dict[str, np.ndarray]:
         """Mapping of formulas to array of domain boundary points."""