From f9e1095b796fe889daf409cc168347d3e1339fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Fri, 3 Nov 2023 12:01:35 +0100 Subject: [PATCH 1/2] Restrict HyperSpy to below version 2 (for the moment) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8068f335..fb483744 100644 --- a/setup.py +++ b/setup.py @@ -153,7 +153,7 @@ "dask[array] >= 2021.8.1", "diffpy.structure >= 3", "diffsims >= 0.5.1", - "hyperspy >= 1.7.3", + "hyperspy >= 1.7.3, < 2", "h5py >= 2.10", "imageio", "matplotlib >= 3.5", From 5335f8800032f9bae3b7554d33569548889597c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Wiik=20=C3=85nes?= Date: Fri, 3 Nov 2023 12:02:01 +0100 Subject: [PATCH 2/2] Add changelog entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7614891b..994e1764 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -47,6 +47,9 @@ Changed - Remove dependency on panel for documentation, and with that interactive 3D visualization of master patterns in the documentation (the hope is to reintroduce it with trame at some point). (`#652 `_) +- Restrict HyperSpy to below the forthcoming version 2. The plan is to remove this + restriction once kikuchipy is compatible with this version. + (`#657 `_) Deprecated ----------