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

Added dependency for scikit-image. #1074

Merged
merged 2 commits into from
Jun 17, 2016
Merged

Added dependency for scikit-image. #1074

merged 2 commits into from
Jun 17, 2016

Conversation

jan-car
Copy link
Contributor

@jan-car jan-car commented Jun 16, 2016

As mentioned in #1058 and #708

@francisco-dlp
Copy link
Member

Great, you have only missed adding it to anaconda_hyperspy_environment.yml.

We usually try to minimize the number of non-pure-python packages that HyperSpy's depend on. Notice e.g. that HyperSpy doesn't require scikit-learn, but installing it enables some features. I think that we should do the same about skimage.

So, in practice, all that I'm proposing is to remove scikit-image from install_requirements in setup.py.

Once the issues above are addressed, I think that this is ready to merge. One minor comment: normally we add dependencies with the feature that requires them, why submitting this as a separate PR?

@dnjohnstone
Copy link
Contributor

@francisco-dlp the separate PR is my fault/suggestion - it's just in this particular case we have more than one PR, that I expect will be merged before too long, that adds this dependency and I thought this would be a cleaner solution to get this in to the master and thus tidy up the other PRs/reduce risk of them containing their own bugs on this bit.

@jan-car
Copy link
Contributor Author

jan-car commented Jun 17, 2016

Are you sure it is missing in anaconda_hyperspy_environment.yml? I did not add it, but it is present as far as I can see:

name: hyperspy
dependencies:

  • python=3.5
  • dill
  • h5py
  • ipython
  • jupyter
  • matplotlib
  • nose
  • numpy
  • qt
  • scikit-image
  • scikit-learn
  • scipy
  • setuptools
  • statsmodels
  • sympy
  • natsort
  • ncurses
  • pip:
    • dask
    • hyperspy
    • traits
    • traitsui
    • ipywidgets

scikit-image is now gone from the install_requirements in setup.py. As it is only lazy-imported when neccessary in WaveImage, everyone who does not use it should be fine without skimage.

@francisco-dlp
Copy link
Member

You are right, sorry for that.

@francisco-dlp francisco-dlp merged commit 66794a6 into hyperspy:master Jun 17, 2016
@jan-car jan-car deleted the NEW_scikit-image_dependency branch June 17, 2016 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants