Merge remote-tracking branch 'upstream/RELEASE_next_patch' into RELEA…

…SE_next_minor # Conflicts: # hyperspy/Release.py
jlaehne · Oct 29, 2022 · 1149b55 · 1149b55
2 parents fd4b1ae + 9c0ec4b
commit 1149b55
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,24 @@ https://hyperspy.readthedocs.io/en/latest/user_guide/changes.html
 
 .. towncrier release notes start
 
+Hyperspy 1.7.3 (2022-10-29)
+===========================
+
+Bug Fixes
+---------
+
+- Fix error when reading Velox containing FFT with odd number of pixels (`#3040 <https://github.com/hyperspy/hyperspy/issues/3040>`_)
+- Fix pint Unit for pint>=0.20 (`#3052 <https://github.com/hyperspy/hyperspy/issues/3052>`_)
+
+
+Maintenance
+-----------
+
+- Fix deprecated import of scipy ``ascent`` in docstrings and the test suite (`#3032 <https://github.com/hyperspy/hyperspy/issues/3032>`_)
+- Fix error handling when trying to convert a ragged signal to non-ragged for numpy >=1.24 (`#3033 <https://github.com/hyperspy/hyperspy/issues/3033>`_)
+- Fix getting random state dask for dask>=2022.10.0 (`#3049 <https://github.com/hyperspy/hyperspy/issues/3049>`_)
+
+
 Hyperspy 1.7.2 (2022-09-17)
 ===========================
 

diff --git a/hyperspy/misc/axis_tools.py b/hyperspy/misc/axis_tools.py
@@ -17,7 +17,7 @@
 
 
 import numpy as np
-from pint.unit import Unit
+from hyperspy.api_nogui import _ureg
 
 
 def check_axes_calibration(ax1, ax2, rtol=1e-7):
@@ -43,12 +43,12 @@ def check_axes_calibration(ax1, ax2, rtol=1e-7):
     """
     if ax1.size == ax2.size:
         try:
-            unit1 = Unit(ax1.units)
+            unit1 = _ureg.Unit(ax1.units)
         except:
             unit1 = ax1.units
         try:
             unit2 = ax2.units
-            unit2 = Unit(ax2.units)
+            unit2 = _ureg.Unit(ax2.units)
         except:
             pass
         if np.allclose(ax1.axis, ax2.axis, atol=0, rtol=rtol) and unit1 == unit2:

diff --git a/upcoming_changes/3032.maintenance.rst b/upcoming_changes/3032.maintenance.rst
diff --git a/upcoming_changes/3033.maintenance..rst b/upcoming_changes/3033.maintenance..rst
diff --git a/upcoming_changes/3040.bugfix.rst b/upcoming_changes/3040.bugfix.rst
diff --git a/upcoming_changes/3049.maintenance.rst b/upcoming_changes/3049.maintenance.rst