-
Notifications
You must be signed in to change notification settings - Fork 41
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
Remove RichDEM from source, moved utility functions to conftest.py #612
Remove RichDEM from source, moved utility functions to conftest.py #612
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that there are still occurrences of 'richdem' in the docstrings in the terrain.py
file.
The file dev-environment.yml is missing some modifications. |
3a40b4d
to
2b4a009
Compare
@duboise-cnes @adehecq @rhugonnet it's okay for me, what about you ? |
Amazing! I did not pick up on anything in the code 🙂. My only remark: I agree we should state somewhere that we use RichDEM only for tests to clarify the link in terms of license, but I wonder if the README is the best place for this. Is there another file where this could fit (linked to license and dependencies)? |
I have looked quickly during vacations :) seems ok for me too. As romain said, not needeed in the readme, it is more internal of the project, no need to expose it in the main entrance. Not sure it is needeed in the contributing part either Anyway, if only used in tests, there is no so much problem left, this is the more important. Thanks for the PR |
2b4a009
to
e8bb887
Compare
@rhugonnet @duboise-cnes Thank you for your feedback. As a NOTICE file will be added with PR #617 I have deleted the changes in the README. Romain and Amaury, don't hesitate to let me know if you want to delete the changes in the contributing part too. |
Perfect for a NOTICE file! I agree to also remove from CONTRIBUTING. |
e8bb887
to
54a5992
Compare
54a5992
to
256c2e6
Compare
Description
This PR resolves the ticket #558 that requires the removal of the
RichDEM
dependency from the core functionnality of thexDEM
project to ensure the project's license is not impacted byRichDEM
's GNU GPL v3.0 license.The changes made in this PR remove
RichDEM
from operational code and ensure thatRichDEM
is only used for testing purposes. Additionally, documentation and contribution guides have been updated to reflect this adjustment.Changes Implemented
Dependency Management
Updated
setup.cfg
anddev-environment.yml
to move therichdem
package from the mainopt
dependencies to thetest
section.Source modifications
terrain.py
anddem.py
, theuse_richdem
parameter was removed from functions.RichDEM
were completely removed.Tests adjustments
RichDEM
is still used in tests to ensure that all attribute functions give the same results as those ofRichDEM
. The corresponding part of the code that has been removed from source was transfered toconftest.py
.Documentation Updates
use_richdem
parameter from functionsRichDEM
should only be used in tests, and core functionality ofxdem
must not rely onRichDEM
to comply with the license.Additional informations
Resolves #373