ruff unignore RET501 and fix unnecessary return none

Author: janosh

pymatgen/analysis/bond_valence.py

@@ -295,7 +295,7 @@ def _recurse(assigned=None):
                 # recurses to find permutations of valences based on whether a
                 # charge balanced assignment can still be found
                 if self._n > self.max_permutations:
-                    return None
+                    return
                 if assigned is None:
                     assigned = []
 
@@ -312,16 +312,16 @@ def _recurse(assigned=None):
 
                 if highest < 0 or lowest > 0:
                     self._n += 1
-                    return None
+                    return
 
                 if i == len(valences):
                     evaluate_assignment(assigned)
                     self._n += 1
-                    return None
+                    return
                 for v in valences[i]:
                     new_assigned = list(assigned)
                     _recurse([*new_assigned, v])
-                return None
+                return
 
         else:
             n_sites = np.array([len(i) for i in equi_sites])
@@ -373,7 +373,7 @@ def _recurse(assigned=None):
                 # recurses to find permutations of valences based on whether a
                 # charge balanced assignment can still be found
                 if self._n > self.max_permutations:
-                    return None
+                    return
                 if assigned is None:
                     assigned = []
 
@@ -392,18 +392,18 @@ def _recurse(assigned=None):
 
                 if highest < -self.charge_neutrality_tolerance or lowest > self.charge_neutrality_tolerance:
                     self._n += 1
-                    return None
+                    return
 
                 if i == len(new_valences):
                     evaluate_assignment(assigned)
                     self._n += 1
-                    return None
+                    return
 
                 for v in new_valences[i]:
                     new_assigned = list(assigned)
                     _recurse([*new_assigned, v])
 
-                return None
+                return
 
         _recurse()
 

pymatgen/analysis/chemenv/coordination_environments/structure_environments.py

@@ -677,12 +677,12 @@ def plot_csm_and_maps(self, isite, max_csm=8.0):
             import matplotlib.pyplot as plt
         except ImportError:
             print('Plotting Chemical Environments requires matplotlib ... exiting "plot" function')
-            return None
+            return
         fig = self.get_csm_and_maps(isite=isite, max_csm=max_csm)
         if fig is None:
-            return None
+            return
         plt.show()
-        return None
+        return
 
     def get_csm_and_maps(self, isite, max_csm=8.0, figsize=None, symmetry_measure_type=None):
         """

pymatgen/entries/mixing_scheme.py

@@ -735,7 +735,7 @@ def display_entries(entries):
         try:
             pd = PhaseDiagram(entries)
         except ValueError:
-            return None
+            return
 
         print(
             f"{'entry_id':<12}{'formula':<12}{'spacegroup':<12}{'run_type':<10}{'eV/atom':<8}"
@@ -747,4 +747,4 @@ def display_entries(entries):
                 f"{e.parameters['run_type']:<10}{e.energy_per_atom:<8.3f}"
                 f"{e.correction / e.composition.num_atoms:<9.3f} {pd.get_e_above_hull(e):<9.3f}"
             )
-        return None
+        return

pymatgen/io/abinit/pseudos.py

@@ -1301,12 +1301,12 @@ def Z_val(self):
     def l_max(self):
         """Maximum angular momentum."""
         # TODO return an actual value
-        return None
+        return
 
     @property
     def l_local(self):
         """Angular momentum used for the local part."""
-        return None
+        return
 
     @property
     def summary(self):

pymatgen/io/res.py

@@ -438,7 +438,7 @@ def _parse_date(cls, string: str) -> date:
 
     def _raise_or_none(self, err: ParseError) -> None:
         if self.parse_rems != "strict":
-            return None
+            return
         raise err
 
     def get_run_start_info(self) -> tuple[date, str] | None:

pymatgen/transformations/advanced_transformations.py

@@ -95,7 +95,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -158,7 +158,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -265,7 +265,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -506,7 +506,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -576,7 +576,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -954,7 +954,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1186,7 +1186,7 @@ def apply_transformation(self, structure: Structure, return_ranked_list: bool |
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1272,7 +1272,7 @@ def apply_transformation(self, structure):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1334,7 +1334,7 @@ def apply_transformation(self, structure: Structure, return_ranked_list: bool |
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1536,7 +1536,7 @@ def apply_transformation(self, structure):
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1682,7 +1682,7 @@ def inverse(self):
         Returns:
             None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1775,7 +1775,7 @@ def apply_transformation(self, structure: Structure, return_ranked_list: bool |
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1934,7 +1934,7 @@ def apply_transformation(self, structure: Structure, return_ranked_list: bool |
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -2193,7 +2193,7 @@ def _get_unique_bestsqs_strucs(sqs, best_only, return_ranked_list, remove_duplic
     @property
     def inverse(self):
         """Returns: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -2282,7 +2282,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:

pymatgen/transformations/site_transformations.py

@@ -80,7 +80,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Return: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -132,7 +132,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Return: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -176,7 +176,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Return: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -534,7 +534,7 @@ def __repr__(self):
     @property
     def inverse(self):
         """Return: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -573,7 +573,7 @@ def apply_transformation(self, structure):
     @property
     def inverse(self):
         """Return: None"""
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:

pymatgen/transformations/standard_transformations.py

@@ -119,7 +119,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -179,7 +179,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -218,7 +218,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -400,7 +400,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -491,7 +491,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
 
 class OrderDisorderedStructureTransformation(AbstractTransformation):
@@ -681,7 +681,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -739,7 +739,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -790,7 +790,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -848,7 +848,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -970,7 +970,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool:
@@ -1103,7 +1103,7 @@ def inverse(self):
         """
         Returns: None
         """
-        return None
+        return
 
     @property
     def is_one_to_many(self) -> bool: