Merge branch 'materialsproject:master' into master

.gitignore

@@ -40,3 +40,4 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.pdm-python

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