Merge branch 'master' into bluesky-helpers

Author: ddkohler

.gitignore

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

CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+### 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):

WrightTools/data/_join.py

@@ -209,6 +209,10 @@ def combine(data, out, item_name, new_idx, transpose, slice_):
             vals[:] = 0
         # Use advanced indexing to populate vals, a temporary array with same shape as out
         valid_index = tuple(wt_kit.valid_index(new_idx, new.shape))
+        if all(
+            [isinstance(i, int) for i in valid_index]
+        ):  # patched: numpy now doesn't let you set element array of size 1
+            valid_index = [[i] for i in valid_index]
         vals[valid_index] = old[:].transpose(transpose)[slice_]
 
         # Overlap methods are accomplished by adding the existing array with the one added

pyproject.toml

@@ -50,7 +50,7 @@ dev = [
     "pydocstyle",
     "pytest",
     "pytest-cov",
-    "databroker>=1.2",
+    "databroker<2",
     "msgpack",
     "sphinx<8.0",
     "sphinx-gallery==0.8.2",

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"]