Merge pull request #3363 from infotroph/relicense-remote-and-workflow

Relicense remote, workflow, data.mining, global-sensitivity as BSD3
PecanProject · Aug 27, 2024 · 4c08d66 · 4c08d66
2 parents 04c8482 + fe3352f
commit 4c08d66
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 166 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,9 +13,10 @@ 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 packages `PEcAn.all` and `PEcAn.QAQC`
+    * Shiny apps `dbsync`, `Data-Ingest`, `Elicitation`, and `global-sensitivity`
+    * Base packages `PEcAn.all`, `PEcAn.QAQC`, `PEcAn.remote`, and `PEcAn.workflow`
     * Model packages `PEcAn.LDNDC`, `PEcAn.SIBCASA`, and `PEcAn.STICS`
+    * Module `PEcAn.data.mining`
 
 ### Removed
 

diff --git a/base/remote/LICENSE b/base/remote/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/remote/NEWS.md b/base/remote/NEWS.md
@@ -1,5 +1,7 @@
 # PEcAn.remote 1.8.0.9000
 
+* PEcAn.remote is now distributed under the BSD 3-clause license instead of the NCSA Open Source license.
+
 
 # PEcAn.remote 1.8.0
 

diff --git a/base/remote/R/fqdn.R b/base/remote/R/fqdn.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
-#-------------------------------------------------------------------------------
-
 ##' Returns the fully qualified hostname. This is potentially different from `Sys.info()['nodename']`
 ##' which can return just the hostname part and not the domain as well. For example the machine
 ##' pecan.ncsa.illinois.edu will return just that as fqdn but only pecan for hostname.

diff --git a/base/remote/R/start.model.runs.R b/base/remote/R/start.model.runs.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
-##-------------------------------------------------------------------------------
-
-
 ##' Start selected ecosystem model runs within PEcAn workflow
 ##'
 ##' DEFUNCT: This function has been moved to PEcAn.workflow::start_model_runs;

diff --git a/base/remote/tests/testthat/test.localhost.R b/base/remote/tests/testthat/test.localhost.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
-#-------------------------------------------------------------------------------
 test_that('is.localhost works', {
   expect_true(is.localhost("localhost"))
   expect_true(is.localhost(fqdn()))

diff --git a/base/workflow/LICENSE b/base/workflow/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/workflow/NEWS.md b/base/workflow/NEWS.md
@@ -1,5 +1,6 @@
 # PEcAn.workflow 1.8.0.9000
 
+* PEcAn.workflow is now distributed under the BSD 3-clause license instead of the NCSA Open Source license.
 
 
 # PEcAn.workflow 1.8.0

diff --git a/base/workflow/R/start_model_runs.R b/base/workflow/R/start_model_runs.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
-##-------------------------------------------------------------------------------
-
-
 #' Start selected ecosystem model runs within PEcAn workflow
 #'
 #' @param settings pecan settings object

diff --git a/modules/data.mining/LICENSE b/modules/data.mining/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/modules/data.mining/NEWS.md b/modules/data.mining/NEWS.md
@@ -0,0 +1,16 @@
+# PEcAn.data.mining 1.7.3.9000
+
+## License change
+* PEcAn.data.mining is now distributed under the BSD three-clause license instead of the NCSA Open Source license.
+
+
+
+# PEcAn.data.mining 1.7.3
+
+* code cleanup
+
+
+# PEcAn.data.mining 1.7.1
+
+* All changes in 1.7.1 and earlier were recorded in a single file for all of the PEcAn packages; please see 
+https://github.com/PecanProject/pecan/blob/v1.7.1/CHANGELOG.md for details.
diff --git a/modules/data.mining/tests/testthat.R b/modules/data.mining/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)
 
 PEcAn.logger::logger.setQuitOnSevere(FALSE)

diff --git a/shiny/global-sensitivity/LICENSE b/shiny/global-sensitivity/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