From 3cc410227c9ec0958dfe83223a702de897ddd14e Mon Sep 17 00:00:00 2001 From: Chris Black Date: Sun, 14 Jul 2024 22:34:20 -0700 Subject: [PATCH 1/3] relicense QAQC with consent of all contributors to existing code --- CHANGELOG.md | 2 +- base/qaqc/LICENSE | 32 ++----------------- base/qaqc/R/taylor.plot.R | 9 ------ base/qaqc/inst/extdata/extdata.R | 10 ------ base/qaqc/tests/testthat.R | 8 ----- base/qaqc/tests/testthat/test-taylorplot.R | 9 ------ .../qaqc/vignettes/function_relationships.Rmd | 11 ------- base/qaqc/vignettes/module_output.Rmd | 11 ------- 8 files changed, 4 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ffee225c8e..3aeec089879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha ### Changed - The following components have changed their licensing. With approval of all their contributors, we now provide them under a BSD 3-clause license rather than the previously used NCSA Open Source license. As a reminder, we intend to relicense the entire system and this list will expand as we gather permission from the relevant copyright owners. * Shiny apps `dbsync`, `Data-Ingest`, and `Elicitation` - * Base package `PEcAn.all` + * Base packages `PEcAn.all` and `PEcAn.QAQC` * Model packages `PEcAn.LDNDC` and `PEcAn.SIBCASA` ### Removed diff --git a/base/qaqc/LICENSE b/base/qaqc/LICENSE index 9e38c2dc685..09ef35a60b4 100644 --- a/base/qaqc/LICENSE +++ b/base/qaqc/LICENSE @@ -1,29 +1,3 @@ -University of Illinois/NCSA Open Source License - -Copyright (c) 2012, University of Illinois, NCSA. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal with the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimers. -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. -- Neither the names of University of Illinois, NCSA, nor the names - of its contributors may be used to endorse or promote products - derived from this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. - +YEAR: 2024 +COPYRIGHT HOLDER: PEcAn Project +ORGANIZATION: PEcAn Project, authors affiliations diff --git a/base/qaqc/R/taylor.plot.R b/base/qaqc/R/taylor.plot.R index 6892f85e5bc..ae00f76030e 100644 --- a/base/qaqc/R/taylor.plot.R +++ b/base/qaqc/R/taylor.plot.R @@ -1,12 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- - ##' Plot taylor diagram for benchmark sites ##' ##' @param dataset data to plot diff --git a/base/qaqc/inst/extdata/extdata.R b/base/qaqc/inst/extdata/extdata.R index 8d1ca510942..a4d63684019 100644 --- a/base/qaqc/inst/extdata/extdata.R +++ b/base/qaqc/inst/extdata/extdata.R @@ -1,13 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- - -#--------------------------------------------------------------------------------------------------# ##' ##' generate benchmarking inputs table ##' @title Generate benchmarking inputs diff --git a/base/qaqc/tests/testthat.R b/base/qaqc/tests/testthat.R index f046421f15b..bf5de661ff5 100644 --- a/base/qaqc/tests/testthat.R +++ b/base/qaqc/tests/testthat.R @@ -1,11 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- library(testthat) library(PEcAn.qaqc) diff --git a/base/qaqc/tests/testthat/test-taylorplot.R b/base/qaqc/tests/testthat/test-taylorplot.R index 012a380bb3e..7acc7853bcc 100644 --- a/base/qaqc/tests/testthat/test-taylorplot.R +++ b/base/qaqc/tests/testthat/test-taylorplot.R @@ -1,12 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- - test_that("taylor diagram", { set.seed(1) diff --git a/base/qaqc/vignettes/function_relationships.Rmd b/base/qaqc/vignettes/function_relationships.Rmd index 1de4de04f7b..9c751fca9bb 100644 --- a/base/qaqc/vignettes/function_relationships.Rmd +++ b/base/qaqc/vignettes/function_relationships.Rmd @@ -6,17 +6,6 @@ vignette: > %\VignetteEngine{knitr::rmarkdown} --- - - This some code helps to visualize the interdependence of functions within PEcAn diff --git a/base/qaqc/vignettes/module_output.Rmd b/base/qaqc/vignettes/module_output.Rmd index 4ab3566b0ca..9d9ec773f2d 100644 --- a/base/qaqc/vignettes/module_output.Rmd +++ b/base/qaqc/vignettes/module_output.Rmd @@ -6,17 +6,6 @@ vignette: > %\VignetteEngine{knitr::rmarkdown} --- - - To get a better understanding on what files are created where, Rob created a workflow as an SVG diagram. You can find the diagram at http://isda.ncsa.illinois.edu/~kooper/EBI/workflow.svg From 443c6c44858f58ab0fd2507fc109e5d65a6f8162 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Sun, 14 Jul 2024 23:20:51 -0700 Subject: [PATCH 2/3] relicense PEcAn.STICS --- CHANGELOG.md | 2 +- models/stics/LICENSE | 37 +++-------------------------- models/stics/R/met2model.STICS.R | 10 -------- models/stics/R/model2netcdf.STICS.R | 10 -------- models/stics/R/write.config.STICS.R | 10 -------- models/stics/tests/testthat.R | 8 ------- 6 files changed, 4 insertions(+), 73 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aeec089879..2280cfc967e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha - The following components have changed their licensing. With approval of all their contributors, we now provide them under a BSD 3-clause license rather than the previously used NCSA Open Source license. As a reminder, we intend to relicense the entire system and this list will expand as we gather permission from the relevant copyright owners. * Shiny apps `dbsync`, `Data-Ingest`, and `Elicitation` * Base packages `PEcAn.all` and `PEcAn.QAQC` - * Model packages `PEcAn.LDNDC` and `PEcAn.SIBCASA` + * Model packages `PEcAn.LDNDC`, `PEcAn.SIBCASA`, and `PEcAn.STICS` ### Removed diff --git a/models/stics/LICENSE b/models/stics/LICENSE index 5a9e44128f1..09ef35a60b4 100644 --- a/models/stics/LICENSE +++ b/models/stics/LICENSE @@ -1,34 +1,3 @@ -## This is the master copy of the PEcAn License - -University of Illinois/NCSA Open Source License - -Copyright (c) 2012, University of Illinois, NCSA. All rights reserved. - -PEcAn project -www.pecanproject.org - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal with the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimers. -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. -- Neither the names of University of Illinois, NCSA, nor the names - of its contributors may be used to endorse or promote products - derived from this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. - +YEAR: 2024 +COPYRIGHT HOLDER: PEcAn Project +ORGANIZATION: PEcAn Project, authors affiliations diff --git a/models/stics/R/met2model.STICS.R b/models/stics/R/met2model.STICS.R index 509fdc049e9..1d53bdd13ea 100644 --- a/models/stics/R/met2model.STICS.R +++ b/models/stics/R/met2model.STICS.R @@ -1,13 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- - -##-------------------------------------------------------------------------------------------------# ##' Converts a met CF file to a model specific met file. The input ##' files are calld /.YYYY.cf ##' diff --git a/models/stics/R/model2netcdf.STICS.R b/models/stics/R/model2netcdf.STICS.R index e7e8409232e..924c67b3637 100644 --- a/models/stics/R/model2netcdf.STICS.R +++ b/models/stics/R/model2netcdf.STICS.R @@ -1,13 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- - -##-------------------------------------------------------------------------------------------------# ##' Convert STICS output into the NACP Intercomparison format (ALMA using netCDF) ##' ##' @name model2netcdf.STICS diff --git a/models/stics/R/write.config.STICS.R b/models/stics/R/write.config.STICS.R index ba34cf52947..39802f5520a 100644 --- a/models/stics/R/write.config.STICS.R +++ b/models/stics/R/write.config.STICS.R @@ -1,13 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- - -##-------------------------------------------------------------------------------------------------# ##' Writes STICS configurations. ##' ##' Requires a pft xml object, a list of trait values for a single model run, diff --git a/models/stics/tests/testthat.R b/models/stics/tests/testthat.R index b7618603b85..0f26d96ee97 100644 --- a/models/stics/tests/testthat.R +++ b/models/stics/tests/testthat.R @@ -1,11 +1,3 @@ -#------------------------------------------------------------------------------- -# Copyright (c) 2012 University of Illinois, NCSA. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the -# University of Illinois/NCSA Open Source License -# which accompanies this distribution, and is available at -# http://opensource.ncsa.illinois.edu/license.html -#------------------------------------------------------------------------------- library(testthat) library(PEcAn.utils) From cc86b20d0575eb8e2acfc17bd7d73f66adf08ac3 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Mon, 15 Jul 2024 10:15:24 -0700 Subject: [PATCH 3/3] add bd3 text to whole-project LICENSE --- LICENSE | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/LICENSE b/LICENSE index 5a9e44128f1..69b3e155809 100644 --- a/LICENSE +++ b/LICENSE @@ -32,3 +32,37 @@ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. + + + +-------------------- + + +Portions of the PEcAn project are distributed under the BSD 3-clause license: + +Copyright (c) 2024 Pecan Project + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.