From 26cb1f001fefee2ecd137024a876b96a4a6644f3 Mon Sep 17 00:00:00 2001 From: Shuoyuan Huang Date: Wed, 20 Oct 2021 17:40:36 -0500 Subject: [PATCH 01/12] Bug fix for _map_iterate method with function that changes axes --- hyperspy/_signals/lazy.py | 2 +- hyperspy/tests/signals/test_map_method.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hyperspy/_signals/lazy.py b/hyperspy/_signals/lazy.py index a0add71ccc..b255aa5175 100644 --- a/hyperspy/_signals/lazy.py +++ b/hyperspy/_signals/lazy.py @@ -637,7 +637,7 @@ def _map_iterate(self, axes_changed = True if len(output_signal_size) != len(old_sig.axes_manager.signal_shape): drop_axis = old_sig.axes_manager.signal_indices_in_array - new_axis = tuple(range(len(output_signal_size))) + new_axis = tuple(range(len(nav_indexes), len(nav_indexes) + len(output_signal_size))) else: drop_axis = [it for (o, i, it) in zip(output_signal_size, old_sig.axes_manager.signal_shape, diff --git a/hyperspy/tests/signals/test_map_method.py b/hyperspy/tests/signals/test_map_method.py index 6697b069c4..47cde3ab0d 100644 --- a/hyperspy/tests/signals/test_map_method.py +++ b/hyperspy/tests/signals/test_map_method.py @@ -359,6 +359,14 @@ def test_map_iterate_array(self): inplace=False) np.testing.assert_array_equal(s_out.mean(axis=(2, 3)).data, iter_array) + @pytest.mark.parametrize("output_signal_size", [(3,), (3, 4), (3, 4, 5)]) + def test_map_output_signal_size(self, output_signal_size): + def f(data): + return np.ones(output_signal_size) + + s_out = self.s.map(function=f, inplace=False) + assert s_out.data.shape[2:] == output_signal_size + @pytest.mark.parametrize('ragged', [True, False, None]) def test_singleton(ragged): From 4f96fe826642ef918a8aa5c2062b7c5fef558835 Mon Sep 17 00:00:00 2001 From: Shuoyuan Huang Date: Wed, 20 Oct 2021 21:18:58 -0500 Subject: [PATCH 02/12] Add changelog --- upcoming_changes/2837.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 upcoming_changes/2837.bugfix.rst diff --git a/upcoming_changes/2837.bugfix.rst b/upcoming_changes/2837.bugfix.rst new file mode 100644 index 0000000000..ebc95fa2f9 --- /dev/null +++ b/upcoming_changes/2837.bugfix.rst @@ -0,0 +1 @@ +Fix :py:func:`hyperspy._signals.lazy.LazySignal._map_iterate` output incorrect signal size when input and output axes do not match \ No newline at end of file From 51b02eb0b836aede6190b3133863446bc834e8ef Mon Sep 17 00:00:00 2001 From: Shuoyuan Huang Date: Thu, 21 Oct 2021 16:42:46 -0500 Subject: [PATCH 03/12] Add axes_manager to test --- hyperspy/tests/signals/test_map_method.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hyperspy/tests/signals/test_map_method.py b/hyperspy/tests/signals/test_map_method.py index 47cde3ab0d..753ef88529 100644 --- a/hyperspy/tests/signals/test_map_method.py +++ b/hyperspy/tests/signals/test_map_method.py @@ -366,6 +366,7 @@ def f(data): s_out = self.s.map(function=f, inplace=False) assert s_out.data.shape[2:] == output_signal_size + assert s_out.axes_manager.signal_shape == output_signal_size[::-1] @pytest.mark.parametrize('ragged', [True, False, None]) From ec7878e8f5a83c10cdcbc69b1cd3553807b9a8b9 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 24 Oct 2021 21:12:10 +0100 Subject: [PATCH 04/12] h5py 3.5 fix: remove unused code and add changelog entry --- hyperspy/io_plugins/hspy.py | 3 --- upcoming_changes/2843.bugfix.rst | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 upcoming_changes/2843.bugfix.rst diff --git a/hyperspy/io_plugins/hspy.py b/hyperspy/io_plugins/hspy.py index 3520f35eb9..1001175156 100644 --- a/hyperspy/io_plugins/hspy.py +++ b/hyperspy/io_plugins/hspy.py @@ -595,9 +595,6 @@ def overwrite_dataset(group, data, key, signal_axes=None, chunks=None, **kwds): # if the shape or dtype/etc do not match, # we delete the old one and create new in the next loop run del group[key] - if dset == data: - # just a reference to already created thing - pass else: _logger.info(f"Chunks used for saving: {dset.chunks}") if isinstance(data, da.Array): diff --git a/upcoming_changes/2843.bugfix.rst b/upcoming_changes/2843.bugfix.rst new file mode 100644 index 0000000000..8274f4dbf5 --- /dev/null +++ b/upcoming_changes/2843.bugfix.rst @@ -0,0 +1 @@ +Add support for latest h5py release (3.5) From 287868da136c1dedf4371989b417e3fa1f071d4c Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Mon, 25 Oct 2021 18:00:51 +0100 Subject: [PATCH 05/12] Simplify by removing else statement --- hyperspy/io_plugins/hspy.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hyperspy/io_plugins/hspy.py b/hyperspy/io_plugins/hspy.py index 1001175156..072512f707 100644 --- a/hyperspy/io_plugins/hspy.py +++ b/hyperspy/io_plugins/hspy.py @@ -595,16 +595,16 @@ def overwrite_dataset(group, data, key, signal_axes=None, chunks=None, **kwds): # if the shape or dtype/etc do not match, # we delete the old one and create new in the next loop run del group[key] + + _logger.info(f"Chunks used for saving: {dset.chunks}") + if isinstance(data, da.Array): + if data.chunks != dset.chunks: + data = data.rechunk(dset.chunks) + da.store(data, dset) + elif data.flags.c_contiguous: + dset.write_direct(data) else: - _logger.info(f"Chunks used for saving: {dset.chunks}") - if isinstance(data, da.Array): - if data.chunks != dset.chunks: - data = data.rechunk(dset.chunks) - da.store(data, dset) - elif data.flags.c_contiguous: - dset.write_direct(data) - else: - dset[:] = data + dset[:] = data def hdfgroup2dict(group, dictionary=None, lazy=False): From 8b5a12644fc012d01a84987e34679e66a178be3c Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 24 Oct 2021 20:55:14 +0100 Subject: [PATCH 06/12] Pin matplotlib<3.5 because the 3.5 release will break a few interactive tools --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6c8fb1234d..029d6ae5be 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ install_req = ['scipy>=1.1', - 'matplotlib>=3.1.0', + 'matplotlib>=3.1.0,<3.5', 'numpy>=1.17.1', 'traits>=4.5.0', 'natsort', From 3fdff6020d4d3f310f833d06425d8873e471105a Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 24 Oct 2021 21:20:54 +0100 Subject: [PATCH 07/12] Revert "Merge pull request #2773 from magnunor/basesignal_one_value" This reverts commit 11f26a7b54580fdf5e038d8c4f6d98a48257355c, reversing changes made to 67005376b90d4918f91f2bda91b8b2e24110f45b. --- hyperspy/axes.py | 11 +++++----- hyperspy/misc/signal_tools.py | 2 +- hyperspy/signal.py | 5 ----- hyperspy/tests/drawing/test_plot_signal.py | 6 ------ hyperspy/tests/model/test_model.py | 2 +- hyperspy/tests/signals/test_2D.py | 6 ++---- hyperspy/tests/signals/test_3D.py | 4 ++-- .../tests/signals/test_assign_subclass.py | 20 ++----------------- upcoming_changes/2773.bugfix.rst | 1 - 9 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 upcoming_changes/2773.bugfix.rst diff --git a/hyperspy/axes.py b/hyperspy/axes.py index ed374dcb1f..e3f291eda0 100644 --- a/hyperspy/axes.py +++ b/hyperspy/axes.py @@ -1203,10 +1203,7 @@ def _update_attributes(self): self.signal_axes = self.signal_axes[::-1] self.navigation_axes = self.navigation_axes[::-1] self._getitem_tuple = tuple(getitem_tuple) - if len(self.signal_axes) == 1 and self.signal_axes[0].size == 1: - self.signal_dimension = 0 - else: - self.signal_dimension = len(self.signal_axes) + self.signal_dimension = len(self.signal_axes) self.navigation_dimension = len(self.navigation_axes) if self.navigation_dimension != 0: self.navigation_shape = tuple([ @@ -1214,7 +1211,11 @@ def _update_attributes(self): else: self.navigation_shape = () - self.signal_shape = tuple([axis.size for axis in self.signal_axes]) + if self.signal_dimension != 0: + self.signal_shape = tuple([ + axis.size for axis in self.signal_axes]) + else: + self.signal_shape = () self.navigation_size = (np.cumprod(self.navigation_shape)[-1] if self.navigation_shape else 0) self.signal_size = (np.cumprod(self.signal_shape)[-1] diff --git a/hyperspy/misc/signal_tools.py b/hyperspy/misc/signal_tools.py index ed855806f8..d1231f0024 100644 --- a/hyperspy/misc/signal_tools.py +++ b/hyperspy/misc/signal_tools.py @@ -171,7 +171,7 @@ def broadcast_signals(*args, ignore_axis=None): for s in args: data = s._data_aligned_with_axes sam = s.axes_manager - sdim_diff = len(new_sig_axes) - len(sam.signal_axes) + sdim_diff = len(new_sig_axes) - sam.signal_dimension while sdim_diff > 0: slices = (slice(None),) * sam.navigation_dimension slices += (None, Ellipsis) diff --git a/hyperspy/signal.py b/hyperspy/signal.py index c60bc451cc..1103702649 100644 --- a/hyperspy/signal.py +++ b/hyperspy/signal.py @@ -2619,11 +2619,6 @@ def plot(self, navigator="auto", axes_manager=None, plot_markers=True, else: navigator = "slider" if axes_manager.signal_dimension == 0: - if axes_manager.navigation_dimension == 0: - # 0d signal without navigation axis: don't make a figure - # and instead, we display the value - print(self.data) - return self._plot = mpl_he.MPL_HyperExplorer() elif axes_manager.signal_dimension == 1: # Hyperspectrum diff --git a/hyperspy/tests/drawing/test_plot_signal.py b/hyperspy/tests/drawing/test_plot_signal.py index b1a46d77e4..7d6c5add18 100644 --- a/hyperspy/tests/drawing/test_plot_signal.py +++ b/hyperspy/tests/drawing/test_plot_signal.py @@ -314,9 +314,3 @@ def test_plot_autoscale(sdim): s.change_dtype(bool) s.plot() - - -def test_plot_signal_scalar(): - s = hs.signals.BaseSignal([1.0]) - s.plot() - assert s._plot is None diff --git a/hyperspy/tests/model/test_model.py b/hyperspy/tests/model/test_model.py index a8b74b697b..d4b19986d3 100644 --- a/hyperspy/tests/model/test_model.py +++ b/hyperspy/tests/model/test_model.py @@ -763,7 +763,7 @@ def test_out_argument(self): @lazifyTestClass class TestCreateModel: def setup_method(self, method): - self.s = hs.signals.Signal1D(np.asarray([0, 1])) + self.s = hs.signals.Signal1D(np.asarray([0])) self.im = hs.signals.Signal2D(np.ones([1, 1])) def test_create_model(self): diff --git a/hyperspy/tests/signals/test_2D.py b/hyperspy/tests/signals/test_2D.py index c327a64df2..1bbdd251a8 100644 --- a/hyperspy/tests/signals/test_2D.py +++ b/hyperspy/tests/signals/test_2D.py @@ -23,16 +23,14 @@ import pytest from hyperspy.decorators import lazifyTestClass -from hyperspy.signal import BaseSignal from hyperspy.signals import Signal1D, Signal2D def _verify_test_sum_x_E(self, s): np.testing.assert_array_equal(self.signal.data.sum(), s.data) assert s.data.ndim == 1 - # Check that the signal dimension is now 0 - assert s.axes_manager.signal_dimension == 0 - assert isinstance(s, BaseSignal) + # Check that there is still one signal axis. + assert s.axes_manager.signal_dimension == 1 @lazifyTestClass diff --git a/hyperspy/tests/signals/test_3D.py b/hyperspy/tests/signals/test_3D.py index d1452e4360..30500bddf5 100644 --- a/hyperspy/tests/signals/test_3D.py +++ b/hyperspy/tests/signals/test_3D.py @@ -183,7 +183,7 @@ def test_get_navigation_signal_nav_dim0(self): s = self.signal s = s.transpose(signal_axes=3) ns = s._get_navigation_signal() - assert ns.axes_manager.signal_dimension == 0 + assert ns.axes_manager.signal_dimension == 1 assert ns.axes_manager.signal_size == 1 assert ns.axes_manager.navigation_dimension == 0 @@ -233,7 +233,7 @@ def test_get_signal_signal_nav_dim0(self): ns = s._get_signal_signal() assert ns.axes_manager.navigation_dimension == 0 assert ns.axes_manager.navigation_size == 0 - assert ns.axes_manager.signal_dimension == 0 + assert ns.axes_manager.signal_dimension == 1 def test_get_signal_signal_nav_dim1(self): s = self.signal diff --git a/hyperspy/tests/signals/test_assign_subclass.py b/hyperspy/tests/signals/test_assign_subclass.py index 8e2fd659db..dad9226b3a 100644 --- a/hyperspy/tests/signals/test_assign_subclass.py +++ b/hyperspy/tests/signals/test_assign_subclass.py @@ -24,7 +24,6 @@ import hyperspy.api as hs from hyperspy import _lazy_signals -from hyperspy.decorators import lazifyTestClass from hyperspy.exceptions import VisibleDeprecationWarning from hyperspy.io import assign_signal_subclass @@ -88,21 +87,6 @@ def test_id_set_signal_type(): assert id_om == id(s.original_metadata) -@lazifyTestClass -class TestToBaseSignalScalar: - - def setup_method(self, method): - self.s = hs.signals.Signal1D(np.array([0])) - - def test_simple(self): - self.s._assign_subclass() - assert isinstance(self.s, hs.signals.BaseSignal) - assert self.s.axes_manager.signal_dimension == 0 - assert self.s.axes_manager.signal_shape == (1, ) - if self.s._lazy: - assert isinstance(self.s, _lazy_signals.LazySignal) - - class TestConvertBaseSignal: def setup_method(self, method): @@ -138,7 +122,7 @@ def test_base_to_complex(self): class TestConvertSignal1D: def setup_method(self, method): - self.s = hs.signals.Signal1D([0, 1]) + self.s = hs.signals.Signal1D([0]) def test_lazy_to_eels_and_back(self): self.s = self.s.as_lazy() @@ -192,7 +176,7 @@ def test_complex_to_complex2d(self): class TestConvertComplexSignal1D: def setup_method(self, method): - self.s = hs.signals.ComplexSignal1D([0, 1]) + self.s = hs.signals.ComplexSignal1D([0]) def test_complex_to_dielectric_function(self): self.s.set_signal_type("DielectricFunction") diff --git a/upcoming_changes/2773.bugfix.rst b/upcoming_changes/2773.bugfix.rst deleted file mode 100644 index 9991db613d..0000000000 --- a/upcoming_changes/2773.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Signals with 1 value in the signal dimension will now be :py:class:`~.signal.BaseSignal` From 285bb65fb34a24b839f6e79f00eb82c7f12baefe Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 24 Oct 2021 21:26:34 +0100 Subject: [PATCH 08/12] Bump version to 1.6.5 --- hyperspy/Release.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperspy/Release.py b/hyperspy/Release.py index 762d330741..18c4ebd34f 100644 --- a/hyperspy/Release.py +++ b/hyperspy/Release.py @@ -25,7 +25,7 @@ # When running setup.py the ".dev" string will be replaced (if possible) # by the output of "git describe" if git is available or the git # hash if .git is present. -version = "1.6.5.dev0" +version = "1.6.5" description = "Multidimensional data analysis toolbox" license = 'GPL v3' From 1f63f1cfef513e0268551f0941b4cc05ab108f71 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Sun, 24 Oct 2021 21:28:54 +0100 Subject: [PATCH 09/12] Update changelog with `towncrier build` --- CHANGES.rst | 30 ++++++++++++++++++++++++-- upcoming_changes/2796.bugfix.rst | 1 - upcoming_changes/2799.bugfix.rst | 1 - upcoming_changes/2809.bugfix.rst | 1 - upcoming_changes/2809.enhancements.rst | 1 - upcoming_changes/2810.bugfix.rst | 1 - upcoming_changes/2810.deprecation.rst | 1 - upcoming_changes/2837.bugfix.rst | 1 - upcoming_changes/2843.bugfix.rst | 1 - 9 files changed, 28 insertions(+), 10 deletions(-) delete mode 100644 upcoming_changes/2796.bugfix.rst delete mode 100644 upcoming_changes/2799.bugfix.rst delete mode 100644 upcoming_changes/2809.bugfix.rst delete mode 100644 upcoming_changes/2809.enhancements.rst delete mode 100644 upcoming_changes/2810.bugfix.rst delete mode 100644 upcoming_changes/2810.deprecation.rst delete mode 100644 upcoming_changes/2837.bugfix.rst delete mode 100644 upcoming_changes/2843.bugfix.rst diff --git a/CHANGES.rst b/CHANGES.rst index 0dce251645..99925cd5ec 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,8 +8,34 @@ https://hyperspy.readthedocs.io/en/latest/user_guide/changes.html .. towncrier release notes start -Hyperspy 1.6.4 (2021-07-08) -=========================== +v1.6.5 (2021-10-24) +=================== + +Bug Fixes +--------- + +- Suspend plotting during :py:meth:`~.models.eelsmodel.EELSModel.smart_fit` call (`#2796 `_) +- make :py:meth:`~.signal.BaseSignal.add_marker` also check if the plot is not active before plotting signal (`#2799 `_) +- Fix irresponsive ROI added to a signal plot with a right hand side axis (`#2809 `_) +- Fix :py:func:`~.drawing.utils.plot_histograms` drawstyle following matplotlib API change (`#2810 `_) +- Fix :py:func:`hyperspy._signals.lazy.LazySignal._map_iterate` output incorrect signal size when input and output axes do not match (`#2837 `_) +- Add support for latest h5py release (3.5) (`#2843 `_) + + +Deprecations +------------ + +- Rename ``line_style`` to ``linestyle`` in :py:func:`~.drawing.utils.plot_spectra` to match matplotlib argument name (`#2810 `_) + + +Enhancements +------------ + +- :py:meth:`~.roi.BaseInteractiveROI.add_widget` can now take a string or integer instead of tuple of string or integer (`#2809 `_) + + +v1.6.4 (2021-07-08) +=================== Bug Fixes --------- diff --git a/upcoming_changes/2796.bugfix.rst b/upcoming_changes/2796.bugfix.rst deleted file mode 100644 index 9e392758dd..0000000000 --- a/upcoming_changes/2796.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Suspend plotting during :py:meth:`~.models.eelsmodel.EELSModel.smart_fit` call diff --git a/upcoming_changes/2799.bugfix.rst b/upcoming_changes/2799.bugfix.rst deleted file mode 100644 index 59a17eb475..0000000000 --- a/upcoming_changes/2799.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -make :py:meth:`~.signal.BaseSignal.add_marker` also check if the plot is not active before plotting signal diff --git a/upcoming_changes/2809.bugfix.rst b/upcoming_changes/2809.bugfix.rst deleted file mode 100644 index f699b99339..0000000000 --- a/upcoming_changes/2809.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix irresponsive ROI added to a signal plot with a right hand side axis diff --git a/upcoming_changes/2809.enhancements.rst b/upcoming_changes/2809.enhancements.rst deleted file mode 100644 index 28f313980a..0000000000 --- a/upcoming_changes/2809.enhancements.rst +++ /dev/null @@ -1 +0,0 @@ -:py:meth:`~.roi.BaseInteractiveROI.add_widget` can now take a string or integer instead of tuple of string or integer diff --git a/upcoming_changes/2810.bugfix.rst b/upcoming_changes/2810.bugfix.rst deleted file mode 100644 index 16a696ff45..0000000000 --- a/upcoming_changes/2810.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix :py:func:`~.drawing.utils.plot_histograms` drawstyle following matplotlib API change diff --git a/upcoming_changes/2810.deprecation.rst b/upcoming_changes/2810.deprecation.rst deleted file mode 100644 index c744b236cc..0000000000 --- a/upcoming_changes/2810.deprecation.rst +++ /dev/null @@ -1 +0,0 @@ -Rename ``line_style`` to ``linestyle`` in :py:func:`~.drawing.utils.plot_spectra` to match matplotlib argument name diff --git a/upcoming_changes/2837.bugfix.rst b/upcoming_changes/2837.bugfix.rst deleted file mode 100644 index ebc95fa2f9..0000000000 --- a/upcoming_changes/2837.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix :py:func:`hyperspy._signals.lazy.LazySignal._map_iterate` output incorrect signal size when input and output axes do not match \ No newline at end of file diff --git a/upcoming_changes/2843.bugfix.rst b/upcoming_changes/2843.bugfix.rst deleted file mode 100644 index 8274f4dbf5..0000000000 --- a/upcoming_changes/2843.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Add support for latest h5py release (3.5) From 29802ad7fe8a3d3b002a277ee0ed9b37ef210d59 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Tue, 26 Oct 2021 13:58:44 +0100 Subject: [PATCH 10/12] Fix release workflow --- .github/workflows/release.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21dd3daf24..0e34624ea7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,14 +54,14 @@ jobs: python --version which python - - name: install pep517 and twine + - name: install build and twine run: | python -m pip install --upgrade pip - python -m pip install pep517 twine + python -m pip install build twine - name: Build wheels run: | - python -m pep517.build --binary --out-dir dist/ . + python -m build - name: Display content dist folder run: | @@ -105,21 +105,20 @@ jobs: run: | python -m pip install twine + - name: Build source distribution + run: | + pip install build + python -m build --sdist + - name: Build manylinux Python wheels uses: RalfG/python-wheels-manylinux-build@v0.3.3 with: python-versions: 'cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39' build-requirements: 'cython' - - name: Build source distribution - run: | - pip install pep517 - python -m pep517.build --source --out-dir sdist/ . - - name: Display content dist folder run: | ls dist/ - ls sdist/ - name: Install and test distribution env: From 28aed04c5b35bcd5a08c96647890aa7029cb7fdc Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Thu, 28 Oct 2021 18:59:04 +0100 Subject: [PATCH 11/12] Update changelog date and tweak changelog --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 99925cd5ec..29581efb08 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ https://hyperspy.readthedocs.io/en/latest/user_guide/changes.html .. towncrier release notes start -v1.6.5 (2021-10-24) +v1.6.5 (2021-10-28) =================== Bug Fixes @@ -18,7 +18,7 @@ Bug Fixes - make :py:meth:`~.signal.BaseSignal.add_marker` also check if the plot is not active before plotting signal (`#2799 `_) - Fix irresponsive ROI added to a signal plot with a right hand side axis (`#2809 `_) - Fix :py:func:`~.drawing.utils.plot_histograms` drawstyle following matplotlib API change (`#2810 `_) -- Fix :py:func:`hyperspy._signals.lazy.LazySignal._map_iterate` output incorrect signal size when input and output axes do not match (`#2837 `_) +- Fix incorrect :py:meth:`~.signal.BaseSignal.map` output size of lazy signal when input and output axes do not match (`#2837 `_) - Add support for latest h5py release (3.5) (`#2843 `_) From 4694902430cfb7b6627b8463d31223c7b1f68206 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Thu, 28 Oct 2021 19:29:13 +0100 Subject: [PATCH 12/12] Set version to 1.6.6.dev0 --- .github/workflows/release.yml | 2 +- hyperspy/Release.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e34624ea7..fa19cc339d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -143,5 +143,5 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | twine upload dist/*-manylinux*.whl --verbose - twine upload sdist/*.tar.gz --verbose + twine upload dist/*.tar.gz --verbose diff --git a/hyperspy/Release.py b/hyperspy/Release.py index 18c4ebd34f..5e8f675cba 100644 --- a/hyperspy/Release.py +++ b/hyperspy/Release.py @@ -25,7 +25,7 @@ # When running setup.py the ".dev" string will be replaced (if possible) # by the output of "git describe" if git is available or the git # hash if .git is present. -version = "1.6.5" +version = "1.6.6.dev0" description = "Multidimensional data analysis toolbox" license = 'GPL v3'