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

Fix broken conda build #369

Merged
merged 5 commits into from Dec 4, 2018
Merged

Fix broken conda build #369

merged 5 commits into from Dec 4, 2018

Conversation

carterbox
Copy link
Member

@carterbox carterbox commented Nov 29, 2018

Updates the install directions documentation.
Fixes unsatisfiable dependencies problem when building with conda.
h5py and pywavelets are no longer needed?

@coveralls
Copy link

Coverage Status

Coverage remained the same at 49.874% when pulling 5928a9c on fix-build into 3f0610a on master.

@coveralls
Copy link

coveralls commented Nov 29, 2018

Coverage Status

Coverage remained the same at 49.874% when pulling b12d894 on fix-build into e8911b1 on master.

This current build is uninstallable because of a dependency
conflict with mkl=2019
The build system has changed, so these need to be updated. Also,
refactored the docs install page based on some feedback.
@dgursoy
Copy link
Collaborator

dgursoy commented Nov 30, 2018

Thanks @carterbox. Before we merge, could you also set the versions in VERSION and tomopy/__init__.py files to 1.3.0?

@carterbox carterbox merged commit a9d28d7 into master Dec 4, 2018
@carterbox carterbox deleted the fix-build branch December 4, 2018 23:14
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