-
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
Transition to Apache License 2.0: License Update, Author Attribution, and Documentation Compliance #617
base: main
Are you sure you want to change the base?
Conversation
@@ -6,15 +6,15 @@ description = Analysis of digital elevation models (DEMs) | |||
keywords = dem, elevation, geoutils, xarray |
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.
In demcompare, the setup files have a header; I'm checking to see if it's necessary here or not.
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.
not needed, doesn't need to be overcopyrighted ;) setup follows usually a standard way and no invention to be copyrighted.
xdem/__init__.py
Outdated
@@ -1,3 +1,20 @@ | |||
# Copyright (c) 2024 xdem developers |
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.
I'm checking on the dates because I don't think 2024 is the correct one.
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.
but you can adapt to last current year and 2024 can be fit. Depends on the politic on that. On projects, I usually update it to the current year when modified. You modify it, you put the current year. Ok for me... even if it not that problematic.
I'm looking into setting up a changelog file. |
7739840
to
71dbaa1
Compare
Really great to have this done rigorously! 🙂 Other than that, I have three remarks:
Final note: if we address these points consistently, this PR would also resolve #431! |
To be precise, I wasn't talking about the copyright notice, but about the license, which must be adapted to the nature of the protected work. The Apache v2.0 license is a permissive open source license adapted to software. Its vocabulary and clauses make it less suitable for documentation. For the latter, a permissive open source license dedicated to literary and artistic works, such as the Creative Commons Attribution 4.0 International (CC BY 4.0) license, would be more appropriate. Those of you who read French (or have a good automatic translator) can read the blog post I wrote on this subject: |
Thanks @sdinot, your blog post is a great resource! (I'll also peak at the /e/OS/ post for my Fairphone later 😄) You give an example of what the package's README would look like. Would it also be good to add a short version of this notice at the bottom of the documentation pages? If yes, what would this look like (something like: "Copyright xDEM developers: text and figures CC BY 4.0, code snippets 0BSD")? |
I am ok to be added in contributors list (with emmanuel.dubois@cnes.fr) even no commits yet (I will try at some point when less crowded in CNES) : that allows to identify CNES in contributions simply. Pypi author and documentation should be also changed, i agree. Hope it helps to finish this PR |
841ec61
to
f533aa4
Compare
Many thanks for your feedback ! |
|
||
- **Romain Hugonnet** [@rhugonnet](https://github.com/rhugonnet) <romain.hugonnet@gmail.com> | ||
- **Amaury Dehecq** [@adehecq](https://github/adehecq) <amaury.dehecq@univ-grenoble-alpes.fr> | ||
- **Erik Schytt Mannerfelt** [@erikmannerfelt](https://github/erikmannerfelt) |
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.
@erikmannerfelt Do you want an email to be added for you here?
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.
@erikmannerfelt Reminder on this
All good for me, just the couple comments above! |
contributions are subject to the project's copyright under the terms of the | ||
[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). | ||
|
||
See CONTRIBUTING.md for more details on Contributor License Agreement. |
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.
Given this statement, do we need to have a "Contributor License Agreement" section in CONTRIBUTING.md
, or is this just a generic terminology?
(We can also add "the" before "Contributor License Agreement"!)
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.
Good review @rhugonnet : We can indeed remove this statement. We have chosen not to go to a contributor license agreement model. If needed at some point, this will be further evolution.
We could indeed consider placing a copyright notice on all pages of the documentation, as we do in the source code. But the practice is different for documentation. In general, authors simply indicate the license of the code, documentation and other project resources on a dedicated page of the documentation. This difference in practice between source code and documentation is probably due to the fact that a source code file can more easily be extracted from its context and reused in another than a page of documentation. We therefore ensure that each source code file is legally “self-supporting”. It contains not only the source code, but also the name of the copyright holder, the license and the origin of the file. |
f533aa4
to
b832b2c
Compare
b832b2c
to
d583331
Compare
d583331
to
54e50a5
Compare
54e50a5
to
64dc724
Compare
@vschaffn I re-tagged @erikmannerfelt and @fmaussion regarding the author listing + email. |
Description
This PR implements the transition of the xDEM project license from MIT to Apache License 2.0.
Resolves #555
Changes implemented
LICENSE
file has been updated with the full text of the Apache v2.0 license.NOTICE
file has been added to comply with Apache licensing requirements. The file includes necessary copyright notices and details about dependencies used by xdem, including Python, NumPy, Matplotlib, SciPy, Geoutils, Rasterio, GeoPandas, Numba, pyproj, tqdm, scikit-image, scikit-gstat, pyogrio, pandas, scikit-learn, OpenCV, affine, Shapely, pytransform3d, yaml and noisyopt.AUTHORS.md
file has been created listing the main contributors of the project along with their contact information, while mentioning their affiliation with the xDEM developers' copyright.setup.cfg
has been updated with the new license and copyright as well asconf.py
Notes
NOTICE
and insetup.cfg
are not aligned anymore. This will be solved by [POC] Makefile installations #582.