Skip to content

Commit

Permalink
Merge pull request #395 from hakonanes/fix-394
Browse files Browse the repository at this point in the history
Set minimal requirement of importlib_metadata
  • Loading branch information
hakonanes committed Jul 8, 2021
2 parents e46317c + 6270816 commit 2786d85
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 13 deletions.
2 changes: 2 additions & 0 deletions doc/changelog.rst
Expand Up @@ -57,6 +57,8 @@ Deprecated

Fixed
-----
- Set minimal requirement of importlib_metadata to v3.6 so Binder can run user guide
notebooks with HyperSpy 1.6.3. (`#395 <https://github.com/pyxem/kikuchipy/pull/395>`_)
- Row (y) coordinate array returned with the crystal map from dictionary indexing is
correctly sorted. (`#392 <https://github.com/pyxem/kikuchipy/pull/392>`_)
- Deep copying EBSD and EBSDMasterPattern signals carry over, respectively, `xmap` and
Expand Down
29 changes: 16 additions & 13 deletions setup.py
Expand Up @@ -119,20 +119,23 @@
extras_require=extra_feature_requirements,
# fmt: off
install_requires=[
# Restrict newest dask version until
# https://github.com/dask/dask/issues/7583 is resolved
"dask[array] >= 2.18, <= 2021.03.1",
"diffsims >= 0.4",
"hyperspy >= 1.5.2",
"h5py >= 2.10",
"matplotlib >= 3.3",
"numpy >= 1.19",
"numba >= 0.48",
"orix >= 0.6",
"pooch >= 0.13",
# TODO: Restrict newest dask version until
# https://github.com/dask/dask/issues/7583 is resolved
"dask[array] >= 2.18, <= 2021.03.1",
"diffsims >= 0.4",
"hyperspy >= 1.5.2",
"h5py >= 2.10",
# TODO: Remove after new HyperSpy release after v1.6.3.
# See https://github.com/hyperspy/hyperspy/issues/2792.
"importlib_metadata >= 3.6",
"matplotlib >= 3.3",
"numpy >= 1.19",
"numba >= 0.48",
"orix >= 0.6",
"pooch >= 0.13",
"psutil",
"tqdm >= 0.5.2",
"scikit-image >= 0.16.2",
"tqdm >= 0.5.2",
"scikit-image >= 0.16.2",
"scikit-learn",
"scipy",
],
Expand Down

0 comments on commit 2786d85

Please sign in to comment.