From d1e2534a000bdd3679acf79b078ab660089c03e2 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Mon, 12 Jan 2026 07:47:42 -0600 Subject: [PATCH 1/4] remove return from finally blocks --- WrightTools/_dataset.py | 3 +-- WrightTools/_group.py | 3 +-- WrightTools/data/_axis.py | 3 +-- WrightTools/data/_data.py | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/WrightTools/_dataset.py b/WrightTools/_dataset.py index 9eae09ae..d40ee36d 100644 --- a/WrightTools/_dataset.py +++ b/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): diff --git a/WrightTools/_group.py b/WrightTools/_group.py index 94de63c6..7d9d828d 100644 --- a/WrightTools/_group.py +++ b/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): diff --git a/WrightTools/data/_axis.py b/WrightTools/data/_axis.py index 3beb687a..0c833dc6 100644 --- a/WrightTools/data/_axis.py +++ b/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: diff --git a/WrightTools/data/_data.py b/WrightTools/data/_data.py index 6b46a1ce..33db8edf 100644 --- a/WrightTools/data/_data.py +++ b/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: From 5a0bfbdeaa364cb1395bf9edee3aec3340c025d2 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Mon, 12 Jan 2026 08:21:28 -0600 Subject: [PATCH 2/4] pytest custom marks return None --- setup.cfg | 1 + tests/artists/test_interact2D.py | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7623b022..e8cea4fa 100644 --- a/setup.cfg +++ b/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"] diff --git a/tests/artists/test_interact2D.py b/tests/artists/test_interact2D.py index a6548c1d..cc35df69 100755 --- a/tests/artists/test_interact2D.py +++ b/tests/artists/test_interact2D.py @@ -15,7 +15,7 @@ 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(): @@ -23,7 +23,7 @@ def test_MoS2(): 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__": From 561d7224c61b4ad36bc178d07c80cf471d30d7a9 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Mon, 12 Jan 2026 08:30:23 -0600 Subject: [PATCH 3/4] fix more finally statements --- WrightTools/_group.py | 3 +-- WrightTools/data/_axis.py | 3 +-- WrightTools/data/_data.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/WrightTools/_group.py b/WrightTools/_group.py index 7d9d828d..ef493ec9 100644 --- a/WrightTools/_group.py +++ b/WrightTools/_group.py @@ -268,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. diff --git a/WrightTools/data/_axis.py b/WrightTools/data/_axis.py index 0c833dc6..29e02d18 100644 --- a/WrightTools/data/_axis.py +++ b/WrightTools/data/_axis.py @@ -167,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: diff --git a/WrightTools/data/_data.py b/WrightTools/data/_data.py index 33db8edf..f85f0dff 100644 --- a/WrightTools/data/_data.py +++ b/WrightTools/data/_data.py @@ -219,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): From 2e6d3e47cc3e34273406c0ecaf41692ddb6dc634 Mon Sep 17 00:00:00 2001 From: Daniel Kohler <11864045+ddkohler@users.noreply.github.com> Date: Mon, 12 Jan 2026 08:37:23 -0600 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da4aa191..4448e44b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,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