Merge branch 'master' into norm_for_each_many_vars

Author: ddkohler

.gitignore

@@ -48,4 +48,6 @@ coverage.xml
 
 # vim
 *.sw?
+
+# vscode
 /.vscode

CHANGELOG.md

@@ -11,6 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Fixed
 - fixed bug where numpy>2.4 broke `data.join`
 
+### Changed
+- per [PEP 765](https://peps.python.org/pep-0765/), `return` is removed from `finally` blocks
+
 ## [3.6.1]
 
 ### Changed

WrightTools/_dataset.py

@@ -148,8 +148,7 @@ def natural_name(self):
             assert self._natural_name is not None
         except (AssertionError, AttributeError):
             self._natural_name = self.attrs["name"]
-        finally:
-            return self._natural_name
+        return self._natural_name
 
     @natural_name.setter
     def natural_name(self, value):

WrightTools/_group.py

@@ -237,8 +237,7 @@ def natural_name(self):
             assert self._natural_name is not None
         except (AssertionError, AttributeError):
             self._natural_name = self.attrs["name"]
-        finally:
-            return self._natural_name
+        return self._natural_name
 
     @natural_name.setter
     def natural_name(self, value):
@@ -269,8 +268,7 @@ def parent(self):
             if key.endswith("::"):
                 key += posixpath.sep
             self._parent = Group._instances[key]
-        finally:
-            return self._parent
+        return self._parent
 
     def close(self):
         """Close the file that contains the Group.

WrightTools/artists/_helpers.py

@@ -188,7 +188,7 @@ def corner_text(
     text : str
         The text to use.
     distance : number (optional)
-        Distance from the corner. Default is 0.05.
+        Distance from the corner. Default is 0.075.
     ax : axis (optional)
         The axis object to label. If None, uses current axis. Default is None.
     corner : {'UL', 'LL', 'UR', 'LR'} (optional)

WrightTools/data/_axis.py

@@ -120,8 +120,7 @@ def ndim(self) -> int:
             assert self._ndim is not None
         except (AssertionError, AttributeError):
             self._ndim = self.variables[0].ndim
-        finally:
-            return self._ndim
+        return self._ndim
 
     @property
     def points(self) -> np.ndarray:
@@ -168,8 +167,7 @@ def variables(self) -> list:
                 if key in self.parent.variable_names:
                     indices.append(self.parent.variable_names.index(key))
             self._variables = [self.parent.variables[i] for i in indices]
-        finally:
-            return self._variables
+        return self._variables
 
     @property
     def masked(self) -> np.ndarray:

WrightTools/data/_data.py

@@ -166,8 +166,7 @@ def ndim(self) -> int:
                 self._ndim = 0
             else:
                 self._ndim = self.variables[0].ndim
-        finally:
-            return self._ndim
+        return self._ndim
 
     @property
     def shape(self) -> tuple:
@@ -176,8 +175,7 @@ def shape(self) -> tuple:
             assert self._shape is not None
         except (AssertionError, AttributeError):
             self._shape = wt_kit.joint_shape(*self.variables)
-        finally:
-            return self._shape
+        return self._shape
 
     @property
     def size(self) -> int:
@@ -221,8 +219,7 @@ def variables(self) -> tuple:
             assert self._variables is not None
         except (AssertionError, AttributeError):
             self._variables = [self[n] for n in self.variable_names]
-        finally:
-            return tuple(self._variables)
+        return tuple(self._variables)
 
     @property
     def _leaf(self):

setup.cfg

@@ -23,3 +23,4 @@ add-ignore = D105
 [tool:pytest]
 addopts = --durations=10 --cov=WrightTools --verbose --cov-report term:skip-covered
 python_files = tests/*.py
+markers = ["mp_group"]

tests/artists/test_interact2D.py

@@ -15,15 +15,15 @@ def test_perovskite():
             break
         except:
             pass
-    return wt.artists.interact2D(data, xaxis=2, yaxis=1)
+    # return wt.artists.interact2D(data, xaxis=2, yaxis=1)
 
 
 def test_MoS2():
     p = datasets.wt5.v1p0p1_MoS2_TrEE_movie  # axes w2, w1=wm, d2
     data = wt.open(p)
     data.convert("eV")
     data.level(0, 2, -4)
-    return wt.artists.interact2D(data, xaxis=0, yaxis=1, local=True)
+    # return wt.artists.interact2D(data, xaxis=0, yaxis=1, local=True)
 
 
 def test_asymmetric():
@@ -37,7 +37,7 @@ def test_asymmetric():
     data.create_variable("x", values=x[:, None], units="wn")
     data.create_variable("y", values=y[None, :], units="wn")
     data.transform("x", "y")
-    return wt.artists.interact2D(data, xaxis=1, yaxis=0)
+    # return wt.artists.interact2D(data, xaxis=1, yaxis=0)
 
 
 def test_skewed():
@@ -46,7 +46,7 @@ def test_skewed():
     data = wt.data.from_PyCMDS(p)
     data.convert("wn", convert_variables=True)
     data.transform("wm", "w1")  # wm = w1 + 2*w2
-    return wt.artists.interact2D(data, xaxis=0, yaxis=1)
+    # return wt.artists.interact2D(data, xaxis=0, yaxis=1)
 
 
 def test_4D():
@@ -82,7 +82,7 @@ def test_4D():
     data.create_variable("d_1", values=tau[None, None, None, :], units="ps")
 
     data.transform("w_1", "w_2", "w_3", "d_1")
-    return wt.artists.interact2D(data, xaxis=0, yaxis=1, local=True, use_imshow=True)
+    # return wt.artists.interact2D(data, xaxis=0, yaxis=1, local=True, use_imshow=True)
 
 
 if __name__ == "__main__":