From aa30e5797188e430fde1e643043eb5dd3f085242 Mon Sep 17 00:00:00 2001 From: "Jason A. Regina" Date: Mon, 23 Dec 2024 09:07:25 -0600 Subject: [PATCH] Apply Apache v2.0 License (#272) * apply Apache v2.0 license * update superpackage classifier * bump super package to 3.0.0 * bump nwm client to 9.0.0 * update nwm client classifier * update all major package versions * update license classifiers and minimum ht depends versions * add NOTICE file with government statement * add symlinks to NOTICE * add NOTICE to manifest of superpackage * bump minimum python version for superpackage due to metrics compatibility --- LICENSE | 209 +++++++++++++++++- MANIFEST.in | 1 + NOTICE | 21 ++ pyproject.toml | 15 +- python/_restclient/MANIFEST.in | 1 + python/_restclient/NOTICE | 1 + python/_restclient/pyproject.toml | 2 +- .../src/hydrotools/_restclient/_version.py | 2 +- python/events/MANIFEST.in | 1 + python/events/NOTICE | 1 + python/events/pyproject.toml | 2 +- .../events/event_detection/_version.py | 2 +- python/metrics/MANIFEST.in | 1 + python/metrics/NOTICE | 1 + python/metrics/pyproject.toml | 2 +- .../src/hydrotools/metrics/_version.py | 2 +- python/nwis_client/MANIFEST.in | 1 + python/nwis_client/NOTICE | 1 + python/nwis_client/pyproject.toml | 4 +- .../src/hydrotools/nwis_client/_version.py | 2 +- python/nwm_client/MANIFEST.in | 1 + python/nwm_client/NOTICE | 1 + python/nwm_client/pyproject.toml | 4 +- .../src/hydrotools/nwm_client/_version.py | 2 +- python/svi_client/MANIFEST.in | 2 +- python/svi_client/NOTICE | 1 + python/svi_client/pyproject.toml | 4 +- .../src/hydrotools/svi_client/_version.py | 2 +- src/hydrotools/_version.py | 2 +- 29 files changed, 259 insertions(+), 32 deletions(-) create mode 100644 NOTICE create mode 120000 python/_restclient/NOTICE create mode 120000 python/events/NOTICE create mode 120000 python/metrics/NOTICE create mode 120000 python/nwis_client/NOTICE create mode 120000 python/nwm_client/NOTICE create mode 120000 python/svi_client/NOTICE diff --git a/LICENSE b/LICENSE index a0230332..d6456956 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,202 @@ -“Software code created by U.S. Government employees is not subject to copyright -in the United States (17 U.S.C. §105). The United States/Department of Commerce -reserve all rights to seek and obtain copyright protection in countries other -than the United States for Software authored in its entirety by the Department -of Commerce. To this end, the Department of Commerce hereby grants to Recipient -a royalty-free, nonexclusive license to use, copy, and create derivative works -of the Software outside of the United States.” + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/MANIFEST.in b/MANIFEST.in index 1aba38f6..c7ad658c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ include LICENSE +include NOTICE diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..8dd6172d --- /dev/null +++ b/NOTICE @@ -0,0 +1,21 @@ +Copyright 2024 Jason A. Regina and Austin Raney + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Software code created by U.S. Government employees is not subject to copyright in the +United States (17 U.S.C. §105). The United States/Department of Commerce reserves +all rights to seek and obtain copyright protection in countries other than the United +States for Software authored in its entirety by the Department of Commerce. To this end, +the Department of Commerce hereby grants to Recipient a royalty-free, nonexclusive +license to use, copy, and create derivative works of the Software outside of the United +States. diff --git a/pyproject.toml b/pyproject.toml index 53730e2d..7fc97e50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,14 +10,13 @@ authors = [ ] description = "Suite of tools for retrieving USGS NWIS observations and evaluating National Water Model (NWM) data." readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" license = { file = "LICENSE" } classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", - "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -25,11 +24,11 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "hydrotools.nwis_client==3.4.1", - "hydrotools.nwm_client==8.0.0", - "hydrotools.events==1.1.7", - "hydrotools.metrics==1.3.5", - "hydrotools.svi_client==0.0.3" + "hydrotools.nwis_client==4.0.0", + "hydrotools.nwm_client==9.0.0", + "hydrotools.events==2.0.0", + "hydrotools.metrics==2.0.0", + "hydrotools.svi_client==1.0.0" ] dynamic = ["version"] diff --git a/python/_restclient/MANIFEST.in b/python/_restclient/MANIFEST.in index 1aba38f6..c7ad658c 100644 --- a/python/_restclient/MANIFEST.in +++ b/python/_restclient/MANIFEST.in @@ -1 +1,2 @@ include LICENSE +include NOTICE diff --git a/python/_restclient/NOTICE b/python/_restclient/NOTICE new file mode 120000 index 00000000..fb376cfa --- /dev/null +++ b/python/_restclient/NOTICE @@ -0,0 +1 @@ +../../NOTICE \ No newline at end of file diff --git a/python/_restclient/pyproject.toml b/python/_restclient/pyproject.toml index c65d451c..a12e2f23 100644 --- a/python/_restclient/pyproject.toml +++ b/python/_restclient/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/python/_restclient/src/hydrotools/_restclient/_version.py b/python/_restclient/src/hydrotools/_restclient/_version.py index d539d50c..ce1305bf 100644 --- a/python/_restclient/src/hydrotools/_restclient/_version.py +++ b/python/_restclient/src/hydrotools/_restclient/_version.py @@ -1 +1 @@ -__version__ = "3.1.1" +__version__ = "4.0.0" diff --git a/python/events/MANIFEST.in b/python/events/MANIFEST.in index 1aba38f6..c7ad658c 100644 --- a/python/events/MANIFEST.in +++ b/python/events/MANIFEST.in @@ -1 +1,2 @@ include LICENSE +include NOTICE diff --git a/python/events/NOTICE b/python/events/NOTICE new file mode 120000 index 00000000..fb376cfa --- /dev/null +++ b/python/events/NOTICE @@ -0,0 +1 @@ +../../NOTICE \ No newline at end of file diff --git a/python/events/pyproject.toml b/python/events/pyproject.toml index d9d08283..d39d17ca 100644 --- a/python/events/pyproject.toml +++ b/python/events/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/python/events/src/hydrotools/events/event_detection/_version.py b/python/events/src/hydrotools/events/event_detection/_version.py index bf788263..8c0d5d5b 100644 --- a/python/events/src/hydrotools/events/event_detection/_version.py +++ b/python/events/src/hydrotools/events/event_detection/_version.py @@ -1 +1 @@ -__version__ = "1.1.7" +__version__ = "2.0.0" diff --git a/python/metrics/MANIFEST.in b/python/metrics/MANIFEST.in index 1aba38f6..c7ad658c 100644 --- a/python/metrics/MANIFEST.in +++ b/python/metrics/MANIFEST.in @@ -1 +1,2 @@ include LICENSE +include NOTICE diff --git a/python/metrics/NOTICE b/python/metrics/NOTICE new file mode 120000 index 00000000..fb376cfa --- /dev/null +++ b/python/metrics/NOTICE @@ -0,0 +1 @@ +../../NOTICE \ No newline at end of file diff --git a/python/metrics/pyproject.toml b/python/metrics/pyproject.toml index 9c58ff0b..c47e15c3 100644 --- a/python/metrics/pyproject.toml +++ b/python/metrics/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ "Development Status :: 4 - Beta", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/python/metrics/src/hydrotools/metrics/_version.py b/python/metrics/src/hydrotools/metrics/_version.py index 92857f86..8c0d5d5b 100644 --- a/python/metrics/src/hydrotools/metrics/_version.py +++ b/python/metrics/src/hydrotools/metrics/_version.py @@ -1 +1 @@ -__version__ = "1.3.5" +__version__ = "2.0.0" diff --git a/python/nwis_client/MANIFEST.in b/python/nwis_client/MANIFEST.in index 1aba38f6..92309d92 100644 --- a/python/nwis_client/MANIFEST.in +++ b/python/nwis_client/MANIFEST.in @@ -1 +1,2 @@ include LICENSE +inlcude NOTICE diff --git a/python/nwis_client/NOTICE b/python/nwis_client/NOTICE new file mode 120000 index 00000000..fb376cfa --- /dev/null +++ b/python/nwis_client/NOTICE @@ -0,0 +1 @@ +../../NOTICE \ No newline at end of file diff --git a/python/nwis_client/pyproject.toml b/python/nwis_client/pyproject.toml index 648ccc3a..848938e5 100644 --- a/python/nwis_client/pyproject.toml +++ b/python/nwis_client/pyproject.toml @@ -16,7 +16,7 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -27,7 +27,7 @@ classifiers = [ dependencies = [ "pandas", "numpy", - "hydrotools._restclient>=3.0.4", + "hydrotools._restclient>=4.0.0", "aiohttp", "click", ] diff --git a/python/nwis_client/src/hydrotools/nwis_client/_version.py b/python/nwis_client/src/hydrotools/nwis_client/_version.py index a5cfdf59..ce1305bf 100644 --- a/python/nwis_client/src/hydrotools/nwis_client/_version.py +++ b/python/nwis_client/src/hydrotools/nwis_client/_version.py @@ -1 +1 @@ -__version__ = "3.4.1" +__version__ = "4.0.0" diff --git a/python/nwm_client/MANIFEST.in b/python/nwm_client/MANIFEST.in index 1aba38f6..c7ad658c 100644 --- a/python/nwm_client/MANIFEST.in +++ b/python/nwm_client/MANIFEST.in @@ -1 +1,2 @@ include LICENSE +include NOTICE diff --git a/python/nwm_client/NOTICE b/python/nwm_client/NOTICE new file mode 120000 index 00000000..fb376cfa --- /dev/null +++ b/python/nwm_client/NOTICE @@ -0,0 +1 @@ +../../NOTICE \ No newline at end of file diff --git a/python/nwm_client/pyproject.toml b/python/nwm_client/pyproject.toml index 2fc9c3c6..3f9cc18e 100644 --- a/python/nwm_client/pyproject.toml +++ b/python/nwm_client/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -38,7 +38,7 @@ dependencies = [ "azure-storage-blob", "planetary-computer", "adlfs", - "hydrotools._restclient", + "hydrotools._restclient>=4.0.0", "dask[dataframe]", ] dynamic = ["version"] diff --git a/python/nwm_client/src/hydrotools/nwm_client/_version.py b/python/nwm_client/src/hydrotools/nwm_client/_version.py index 73d4c8be..6dcf770e 100644 --- a/python/nwm_client/src/hydrotools/nwm_client/_version.py +++ b/python/nwm_client/src/hydrotools/nwm_client/_version.py @@ -1 +1 @@ -__version__ = "8.0.0" +__version__ = "9.0.0" diff --git a/python/svi_client/MANIFEST.in b/python/svi_client/MANIFEST.in index 6f8c5322..c7ad658c 100644 --- a/python/svi_client/MANIFEST.in +++ b/python/svi_client/MANIFEST.in @@ -1,2 +1,2 @@ include LICENSE -include src/hydrotools/nwm_client/data/* +include NOTICE diff --git a/python/svi_client/NOTICE b/python/svi_client/NOTICE new file mode 120000 index 00000000..fb376cfa --- /dev/null +++ b/python/svi_client/NOTICE @@ -0,0 +1 @@ +../../NOTICE \ No newline at end of file diff --git a/python/svi_client/pyproject.toml b/python/svi_client/pyproject.toml index 171b1ae6..4caf0df1 100644 --- a/python/svi_client/pyproject.toml +++ b/python/svi_client/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Education", "Intended Audience :: Science/Research", - "License :: Free To Use But Restricted", + "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -22,7 +22,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "hydrotools._restclient", + "hydrotools._restclient>=4.0.0", "numpy >=1.20.0", "pandas", "geopandas", diff --git a/python/svi_client/src/hydrotools/svi_client/_version.py b/python/svi_client/src/hydrotools/svi_client/_version.py index 27fdca49..5becc17c 100644 --- a/python/svi_client/src/hydrotools/svi_client/_version.py +++ b/python/svi_client/src/hydrotools/svi_client/_version.py @@ -1 +1 @@ -__version__ = "0.0.3" +__version__ = "1.0.0" diff --git a/src/hydrotools/_version.py b/src/hydrotools/_version.py index 3d67cd6b..528787cf 100644 --- a/src/hydrotools/_version.py +++ b/src/hydrotools/_version.py @@ -1 +1 @@ -__version__ = "2.4.0" +__version__ = "3.0.0"