From 183f6b86de41d3dc0745f2a08286c3a5daab0d66 Mon Sep 17 00:00:00 2001 From: jlaura Date: Tue, 16 Nov 2021 14:37:42 -0700 Subject: [PATCH] Fixes 607 (#613) --- CHANGELOG.md | 1 + LICENSE | 45 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 808731fb..3f3c704b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ release. ### Changed - `geom_match_simple` defaults to a 3rd order warp for interpolation - Speed improvements for place_points_from_cnet dependent on COPY method instead of ORM update +- License from custom to CC0. Fixes [#607](https://github.com/USGS-Astrogeology/autocnet/issues/607) ### Fixed - `update_from_jigsaw` failures due to stale code. Now uses a conntext on the engine to ensure closure diff --git a/LICENSE b/LICENSE index 026b20b4..a28e24d2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,44 @@ -Software and related material (data and (or) documentation), contained in or furnished in connection with a software distribution, are made available by the U.S. Geological Survey (USGS) to be used in the public interest and in the advancement of science. You may, without any fee or cost, use, copy, modify, or distribute this software, and any derivative works thereof, and its supporting documentation, subject to the following restrictions and understandings. +Unless otherwise noted, this project is in the public domain in the +United States. -If you distribute copies or modifications of the software and related material, make sure the recipients receive a copy of this notice and receive or can get a copy of the original distribution. If the software and (or) related material are modified and distributed, it must be made clear that the recipients do not have the original and they must be informed of the extent of the modifications. For example, modified files must include a prominent notice stating the modifications made, the author of the modifications, and the date the modifications were made. This restriction is necessary to guard against problems introduced in the software by others, reflecting negatively on the reputation of the USGS. +It contains materials that originally came from the United States +Geological Survey, an agency of the United States Department of +Interior. For more information on their copyright policies, see +https://www.usgs.gov/information-policies-and-instructions/copyrights-and-credits -The software is public property and you therefore have the right to the source code, if desired. +It also contains materials from contributors that have waived their +copyright interest to the public domain. -You may charge fees for distribution, warranties, and services provided in connection with the software or derivative works thereof. The name USGS can be used in any advertising or publicity to endorse or promote any products or commercial entity using this software if specific written permission is obtained from the USGS. +Additionally, the authors waive copyright and related rights in the +work worldwide through the CC0 1.0 Universal public domain dedication. -The user agrees to appropriately acknowledge the authors and the USGS in publications that result from the use of this software or in products that include this software in whole or in part. +CC0 1.0 Universal Summary +------------------------- -Because the software and related material are free (other than nominal materials and handling fees) and provided "as is," the authors, the USGS, and the United States Government have made no warranty, express or implied, as to accuracy or completeness and are not obligated to provide the user with any support, consulting, training or assistance of any kind with regard to the use, operation, and performance of this software nor to provide the user with any updates, revisions, new versions or "bug fixes". +This is a human-readable summary of the [Legal Code (read the full +text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode). -The user assumes all risk for any damages whatsoever resulting from loss of use, data, or profits arising in connection with the access, use, quality, or performance of this software. \ No newline at end of file + +### No Copyright + +The authors have associated their contributions to the ISIS project +with this deed, and have dedicated the work to the public domain +by waiving all of their rights to the work worldwide under copyright +law, including all related and neighboring rights, to the extent +allowed by law. + +You can copy, modify, distribute and perform the work, even for +commercial purposes, all without asking permission. + + +### Other Information + +In no way are the patent or trademark rights of any person affected +by CC0, nor are the rights that other persons may have in the work +or in how the work is used, such as publicity or privacy rights. + +Unless expressly stated otherwise, the authors who have associated +the ISIS project with this deed make no warranties about the work, +and disclaim liability for all uses of the work, to the fullest +extent permitted by applicable law. When using or citing the work, +you should not imply endorsement by the authors. \ No newline at end of file -- GitLab