Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use numpy.fft instead of scipy.fft #180

Merged
merged 2 commits into from
May 20, 2020
Merged

Conversation

hakonanes
Copy link
Member

Signed-off-by: Håkon Wiik Ånes hwaanes@gmail.com

Description

Tries to fix #179. HyperSpy requires scipy < 1.4 on conda-forge. We started using scipy.fft in v0.2.0 for FFT filtering, but that was introduced in scipy 1.4. Have therefore removed scipy > 1.4 requirement in setup.py and started switched to numpy.fft until HyperSpy removes scipy < 1.4 requirement on conda-forge.

This might affect some of the routines using FFT (image quality calculation, FFT filtering, dynamic background correction, getting the dynamic background).

Also stopped using selectors (dask[array], hyperspy[learning]) and reintroduced scikit-learn as a dependency.

Checklist

For reviewers

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    the unreleased section in doc/changelog.rst.

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes hakonanes added bug Something isn't working maintenance This relates to package maintenance labels May 20, 2020
@hakonanes hakonanes added this to the v0.2.1 milestone May 20, 2020
@coveralls
Copy link

coveralls commented May 20, 2020

Coverage Status

Coverage remained the same at 100.0% when pulling 20b7bec on hakonanes:v0.2.x into 8dba9f2 on kikuchipy:v0.2.x.

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes hakonanes merged commit d9c8234 into pyxem:v0.2.x May 20, 2020
@hakonanes hakonanes deleted the v0.2.x branch May 20, 2020 08:38
@hakonanes hakonanes restored the v0.2.x branch May 20, 2020 08:39
hakonanes added a commit to hakonanes/kikuchipy that referenced this pull request May 20, 2020
Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
@hakonanes hakonanes mentioned this pull request May 20, 2020
6 tasks
hakonanes added a commit that referenced this pull request May 20, 2020
* Cherry-pick #180

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>

* Get changelog updates from v0.2.1 in

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>

* Add PR link to changelog

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>

* Fix PR link

Signed-off-by: Håkon Wiik Ånes <hwaanes@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working maintenance This relates to package maintenance
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants