Skip to content

Commit

Permalink
Merge pull request #418 from ericpre/unpin_dask
Browse files Browse the repository at this point in the history
Unpin dask following dask 2021.8.1
  • Loading branch information
hakonanes committed Aug 23, 2021
2 parents f3c2ccf + 7d593a8 commit 4b1dc4f
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 12 deletions.
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@
"code",
"review"
]
},
{
"login": "ericpre",
"name": "Eric Prestat",
"avatar_url": "https://avatars.githubusercontent.com/u/11851990?v=4",
"profile": "https://github.com/ericpre",
"contributions": [
"code",
"maintenance"
]
}
]
}
}
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- os: ubuntu-latest
python-version: 3.7
OLDEST_SUPPORTED_VERSION: true
DEPENDENCIES: dask==2.18 diffsims==0.4.0 hyperspy==1.5.2 matplotlib==3.3 numpy==1.19 orix==0.6.0 scikit-image==0.16.2
DEPENDENCIES: dask==2021.8.1 diffsims==0.4.0 hyperspy==1.6.4 matplotlib==3.3 numba==0.48 numpy==1.19 orix==0.6.0 scikit-image==0.16.2
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -49,12 +49,12 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Display versions
run: python -V; pip -V
- name: Install depedencies and package
shell: bash
run: pip install -U -e .'[tests]'
- name: Install oldest supported version
if: ${{ matrix.OLDEST_SUPPORTED_VERSION }}
run: pip install ${{ matrix.DEPENDENCIES }}
- name: Install depedencies and package
shell: bash
run: pip install -U -e .'[tests]'
- name: Run docstring tests
if: ${{ matrix.os == 'ubuntu-latest' }}
run: pytest --doctest-modules --ignore-glob=kikuchipy/*/tests
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://github.com/ericpre"><img src="https://avatars.githubusercontent.com/u/11851990?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eric Prestat</b></sub></a><br /><a href="https://github.com/pyxem/kikuchipy/commits?author=ericpre" title="Code">💻</a> <a href="#maintenance-ericpre" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://www.ntnu.edu/employees/hakon.w.anes"><img src="https://avatars.githubusercontent.com/u/12139781?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Håkon Wiik Ånes</b></sub></a><br /></td>
<td align="center"><a href="https://github.com/friedkitteh"><img src="https://avatars.githubusercontent.com/u/11888052?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lars Lervik</b></sub></a><br /><a href="https://github.com/pyxem/kikuchipy/issues?q=author%3Afriedkitteh" title="Bug reports">🐛</a> <a href="https://github.com/pyxem/kikuchipy/commits?author=friedkitteh" title="Code">💻</a> <a href="https://github.com/pyxem/kikuchipy/commits?author=friedkitteh" title="Documentation">📖</a> <a href="#question-friedkitteh" title="Answering Questions">💬</a> <a href="https://github.com/pyxem/kikuchipy/pulls?q=is%3Apr+reviewed-by%3Afriedkitteh" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/pyxem/kikuchipy/commits?author=friedkitteh" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/onatlandsmyr"><img src="https://avatars.githubusercontent.com/u/34620114?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ole Natlandsmyr</b></sub></a><br /><a href="https://github.com/pyxem/kikuchipy/commits?author=onatlandsmyr" title="Code">💻</a> <a href="https://github.com/pyxem/kikuchipy/commits?author=onatlandsmyr" title="Documentation">📖</a> <a href="#question-onatlandsmyr" title="Answering Questions">💬</a> <a href="https://github.com/pyxem/kikuchipy/pulls?q=is%3Apr+reviewed-by%3Aonatlandsmyr" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/pyxem/kikuchipy/commits?author=onatlandsmyr" title="Tests">⚠️</a></td>
Expand Down
4 changes: 4 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Unreleased

Contributors
------------
- Eric Prestat
- Håkon Wiik Ånes
- Lars Andreas Hastad Lervik

Expand All @@ -32,6 +33,9 @@ Added

Changed
-------
- Dependency versions for dask >= 2021.8.1, fixing some memory issues encountered after
2021.3.1, and HyperSpy >= 1.6.4. Remove importlib_metadata from package dependencies.
(`#418 <https://github.com/pyxem/kikuchipy/pull/418>`_)
- Performance improvements to EBSD dictionary generation, giving a substantial speed-up.
(`#405 <https://github.com/pyxem/kikuchipy/pull/405>`_)
- Rename projection methods from `project()`/`iproject()` to
Expand Down
1 change: 1 addition & 0 deletions kikuchipy/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"Lars Andreas Hastad Lervik",
"Ole Natlandsmyr",
"Tina Bergh",
"Eric Prestat",
]
license = "GPLv3+"
maintainer = "Håkon Wiik Ånes"
Expand Down
9 changes: 2 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,10 @@
extras_require=extra_feature_requirements,
# fmt: off
install_requires=[
# TODO: Restrict newest dask version until
# https://github.com/dask/dask/issues/7583 is resolved
"dask[array] >= 2.18, <= 2021.03.1",
"dask[array] >= 2021.8.1",
"diffsims >= 0.4",
"hyperspy >= 1.5.2",
"hyperspy >= 1.6.4",
"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",
Expand Down

0 comments on commit 4b1dc4f

Please sign in to comment.