From be42afe0792bccba893363c940f9abac2c27852a Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Wed, 8 Mar 2023 10:59:33 -0700 Subject: [PATCH 1/8] update copyright --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index e468955f34..ac90f192f0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2013-2021, Sandia National Laboratories and pvlib python Development Team +Copyright (c) 2013-2023, National Technology & Engineering Solutions of Sandia, LLC (NTESS)and pvlib python Development Team All rights reserved. Redistribution and use in source and binary forms, with or without modification, From 6b621e148ea0455a43f65104eba861f90e5d606c Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Wed, 8 Mar 2023 11:35:59 -0700 Subject: [PATCH 2/8] Update LICENSE remove current year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ac90f192f0..26bc1701de 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2013-2023, National Technology & Engineering Solutions of Sandia, LLC (NTESS)and pvlib python Development Team +Copyright (c) 2013, National Technology & Engineering Solutions of Sandia, LLC (NTESS)and pvlib python Development Team All rights reserved. Redistribution and use in source and binary forms, with or without modification, From 027ba2e2986e082f54df65a6d8db6f4500917c73 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Wed, 8 Mar 2023 12:00:46 -0700 Subject: [PATCH 3/8] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 26bc1701de..be6bcd0cd6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2013, National Technology & Engineering Solutions of Sandia, LLC (NTESS)and pvlib python Development Team +Copyright (c) 2013 National Technology & Engineering Solutions of Sandia, LLC (NTESS), and pvlib python Development Team All rights reserved. Redistribution and use in source and binary forms, with or without modification, From 69baa4bd7a0aa4f80034819a156b0e3a7a4bc3c2 Mon Sep 17 00:00:00 2001 From: Hansen Date: Wed, 8 Mar 2023 12:43:39 -0700 Subject: [PATCH 4/8] edit AUTHORS --- AUTHORS.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index a4f93c9e26..4a37af4f9b 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,12 +1,12 @@ About the Copyright Holders =========================== -* Copyright (c) 2013, Sandia National Laboratories +* Copyright (c) 2013, National Technology & Engineering Solutions of Sandia, LLC (NTESS) Sandia National Laboratories developed pvlib python based on code in PVLib MATLAB. -* Copyright (c) 2014-2018, pvlib python Development Team +* Copyright (c) 2014, pvlib python Development Team The pvlib python Development Team is the collection of developers of the pvlib python project. @@ -23,8 +23,8 @@ the pvlib python source code, in its entirety, is not the copyright of any singl person or institution. Instead, it is the collective copyright of the entire pvlib python Development Team. If individual contributors want to maintain a record of what changes/contributions they have specific copyright on, -they should indicate their copyright in the commit message of the change -when they commit the change to the pvlib python repository. +they should indicate their copyright using in-line comments in the code submitted +to the pvlib python repository. License ======= From 9255acf596d7c6d0d97560712e762f09209a2846 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Fri, 10 Mar 2023 06:34:23 -0700 Subject: [PATCH 5/8] restate copyholders and order --- LICENSE | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index be6bcd0cd6..4bf986882f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ BSD 3-Clause License -Copyright (c) 2013 National Technology & Engineering Solutions of Sandia, LLC (NTESS), and pvlib python Development Team +Copyright (c) 2015 pvlib python Contributors +Copyright (c) 2013 Sandia National Laboratories + All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -13,7 +15,7 @@ are permitted provided that the following conditions are met: list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the {organization} nor the names of its + 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. From 0126eedb03db72d8c20dd43f9043bb5e5d674b63 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Fri, 10 Mar 2023 07:23:04 -0700 Subject: [PATCH 6/8] put PVLIB python Developers back --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 4bf986882f..54ff9aa771 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ BSD 3-Clause License Copyright (c) 2015 pvlib python Contributors +Copyright (c) 2014 PVLIB python Developers Copyright (c) 2013 Sandia National Laboratories All rights reserved. From 78768c2039e3bfb985d365dcac8cb1b8e2419592 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Fri, 10 Mar 2023 07:32:42 -0700 Subject: [PATCH 7/8] update authors --- AUTHORS.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 4a37af4f9b..142e8d9034 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,17 +1,19 @@ About the Copyright Holders =========================== -* Copyright (c) 2013, National Technology & Engineering Solutions of Sandia, LLC (NTESS) +* Copyright (c) 2023, pvlib-python Contributors +* Copyright (c) 2014, pvlib python Development Team +* Copyright (c) 2013, Sandia National Laboratories - Sandia National Laboratories developed pvlib python based on code in + Sandia National Laboratories originally developed pvlib python based on code in PVLib MATLAB. -* Copyright (c) 2014, pvlib python Development Team - The pvlib python Development Team is the collection of developers of the pvlib python project. -Full credits for pvlib python contributors can be found in the documentation. + The pvlib-python Contributors comprises all authors of content of the pvlib python project + +A complete list of contributors can be found in the documentation. Our Copyright Policy ==================== @@ -21,10 +23,11 @@ over their contributions to pvlib python. However, it is important to note that these contributions are typically only changes to the repositories. Thus, the pvlib python source code, in its entirety, is not the copyright of any single person or institution. Instead, it is the collective copyright of the -entire pvlib python Development Team. If individual contributors want to maintain -a record of what changes/contributions they have specific copyright on, +Contributors. If individual contributors want to make explicit their copyright +of the contributions they have made, they should indicate their copyright using in-line comments in the code submitted -to the pvlib python repository. +to the pvlib python repository, with the understanding that by contributing, they +grant the pvlib-python license. License ======= From 97547e444bd3cdd0aee857d9ad57c88a69ae0e57 Mon Sep 17 00:00:00 2001 From: Cliff Hansen Date: Fri, 10 Mar 2023 13:22:03 -0700 Subject: [PATCH 8/8] consistency --- AUTHORS.md | 18 +++++++++--------- LICENSE | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 142e8d9034..4ac113dbf8 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,19 +1,19 @@ About the Copyright Holders =========================== -* Copyright (c) 2023, pvlib-python Contributors -* Copyright (c) 2014, pvlib python Development Team -* Copyright (c) 2013, Sandia National Laboratories +* Copyright (c) 2023 pvlib python Contributors +* Copyright (c) 2014 PVLIB python Development Team +* Copyright (c) 2013 Sandia National Laboratories - Sandia National Laboratories originally developed pvlib python based on code in - PVLib MATLAB. + The pvlib python Contributors comprises all authors of content of the pvlib python project. + A complete list of contributors can be found in the documentation. - The pvlib python Development Team is the collection of developers of the - pvlib python project. + The PVLIB python Development Team is the collection of developers of the + pvlib python project. Members of this team are included in the pvlib python Contributors. - The pvlib-python Contributors comprises all authors of content of the pvlib python project + Sandia National Laboratories originally developed pvlib python based on code in + PVLib MATLAB. -A complete list of contributors can be found in the documentation. Our Copyright Policy ==================== diff --git a/LICENSE b/LICENSE index 54ff9aa771..e66a4aa98e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ BSD 3-Clause License -Copyright (c) 2015 pvlib python Contributors -Copyright (c) 2014 PVLIB python Developers +Copyright (c) 2023 pvlib python Contributors +Copyright (c) 2014 PVLIB python Development Team Copyright (c) 2013 Sandia National Laboratories All rights reserved.