larray-project
diff --git a/‎larray/core/axis.py
Lines changed: 5 additions & 6 deletions b/‎larray/core/axis.py
Lines changed: 5 additions & 6 deletions
diff --git a/‎larray/extra/ipfp.py
Lines changed: 10 additions & 7 deletions b/‎larray/extra/ipfp.py
Lines changed: 10 additions & 7 deletions
@@ -1372,8 +1372,7 @@ def align(self, other, join='outer'):
             return other
         elif join == 'exact':
             if not self.equals(other):
-                raise ValueError("align method with join='exact' "
-                                 "expected {!r} to be equal to {!r}".format(self, other))
+                raise ValueError(f"align method with join='exact' expected {self!r} to be equal to {other!r}")
             else:
                 return self
 
@@ -1537,7 +1536,7 @@ def __init__(self, axes=None):
         #     axis_dupes = list(duplicates(axis.labels))
         #     if axis_dupes:
         #         dupe_labels = ', '.join(str(l) for l in axis_dupes)
-        #         warnings.warn("duplicate labels found for axis %s: %s" % (axis.name, dupe_labels),
+        #         warnings.warn(f"duplicate labels found for axis {axis.name}: {dupe_labels}",
         #                       category=UserWarning, stacklevel=2)
         #
         # # check dupes between axes. Using unique to not spot the dupes within the same axis that we just displayed.
@@ -1547,8 +1546,8 @@ def __init__(self, axes=None):
         #     label_axes = [(label, ', '.join(display_name for axis, display_name in zip(axes, self.display_names)
         #                                     if label in axis))
         #                   for label in dupe_labels]
-        #     dupes = '\n'.join("{} is valid in {{{}}}".format(label, axes) for label, axes in label_axes)
-        #     warnings.warn("ambiguous labels found:\n%s" % dupes, category=UserWarning, stacklevel=5)
+        #     dupes = '\n'.join(f"{label} is valid in {{{axes}}}" for label, axes in label_axes)
+        #     warnings.warn(f"ambiguous labels found:\n{dupes}", category=UserWarning, stacklevel=5)
 
     def __dir__(self):
         # called by dir() and tab-completion at the interactive prompt, must return a list of any valid getattr key.
@@ -2857,7 +2856,7 @@ def _translated_key(self, key):
         dupe_axes = list(duplicates(axis for axis, axis_key in key_items))
         if dupe_axes:
             dupe_axes = ', '.join(str(axis) for axis in dupe_axes)
-            raise ValueError("key has several values for axis: %s\n%s" % (dupe_axes, key_items))
+            raise ValueError(f"key has several values for axis: {dupe_axes}\n{key_items}")
 
         # IGroup -> raw positional
         dict_key = {axis: axis.index(axis_key) for axis, axis_key in key_items}
 
@@ -268,15 +268,18 @@ def has_anonymous_axes(a):
         stepcelldiff = abs(r - startr).max()
 
         if display_progress:
+            maxcelldiff = f2str(stepcelldiff)
+            maxdiff2target = f2str(max_sum_diff)
+            stepchange = f2str(step_sum_improvement)
             if display_progress == "condensed":
-                template = "it {} max cell diff {} max diff to target {} ({})"
+                print(f"it {i} max cell diff {maxcelldiff} max diff to target {maxdiff2target} "
+                      f"({stepchange})")
             else:
-                template = """iteration {}
- * max(abs(prev_cell - cell)): {}
- * max(abs(sum - target_sum)): {}
-   \\- change since last iteration: {}
-"""
-            print(template.format(i, f2str(stepcelldiff), f2str(max_sum_diff), f2str(step_sum_improvement)))
+                print(f"""iteration {i}
+ * max(abs(prev_cell - cell)): {maxcelldiff}
+ * max(abs(sum - target_sum)): {maxdiff2target}
+   \\- change since last iteration: {stepchange}
+""")
 
         if np.all(np.array(lastdiffs) == max_sum_diff):
             if no_convergence in {'warn', 'raise'}: