Skip to content

Commit

Permalink
Merge pull request #657 from hakonanes/pin-hyperspy-before-2.0
Browse files Browse the repository at this point in the history
Temporarily pin HyperSpy to version < 2.0 for kikuchipy v0.9
  • Loading branch information
hakonanes authored Nov 3, 2023
2 parents 6f69722 + 5335f88 commit 1ba98e6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pyxem/kikuchipy/pull/652>`_)
- Restrict HyperSpy to below the forthcoming version 2. The plan is to remove this
restriction once kikuchipy is compatible with this version.
(`#657 <https://github.com/pyxem/kikuchipy/pull/657>`_)

Deprecated
----------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 1ba98e6

Please sign in to comment.