From cbe63b6d454a2f91191f5ff60e6896a5bb496a8e Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 9 Aug 2023 15:13:16 -0700 Subject: [PATCH] Doc: Update License Notice (#4171) - We do not need to cover year ranges (just the starting range). - Update to exact wording of current notice texts. --- LICENSE.txt | 2 +- README.md | 7 ++++--- Tools/Release/newVersion.sh | 14 -------------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index c8c1f925ea4..9d9b939f342 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -WarpX v23.08 Copyright (c) 2018-2023, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. +WarpX Copyright (c) 2018, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 95b6f16dfa7..ef0551405a0 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ To contact the developers, feel free to open an issue on this repo, or visit our Our workflow is described in [CONTRIBUTING.rst](CONTRIBUTING.rst). -## License +## Copyright Notice -WarpX Copyright (c) 2018-2023, The Regents of the University of California, +WarpX Copyright (c) 2018, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved. @@ -64,4 +64,5 @@ Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit other to do so. -License for WarpX can be found at [LICENSE.txt](LICENSE.txt). +Please see the full license agreement in [LICENSE.txt](LICENSE.txt). +The SPDX license identifier is `BSD-3-Clause-LBNL`. diff --git a/Tools/Release/newVersion.sh b/Tools/Release/newVersion.sh index 3523c37305f..b1d2a6aad27 100755 --- a/Tools/Release/newVersion.sh +++ b/Tools/Release/newVersion.sh @@ -125,20 +125,6 @@ sed -i "s/"\ "release = u'${VERSION_STR}'/g" \ ${REPO_DIR}/Docs/source/conf.py -# LICENSE -# LICENSE.txt: WarpX vYY.MM Copyright (c) 20YY, The Regents of ... -sed -i -E "s/"\ -"(WarpX v)(.*)([[:blank:]]+Copyright \(c\) 2018-)(.*)(, The Regents of.*)/"\ -"\1${VERSION_STR_NOSUFFIX}\3$(date +%Y)\5/g" \ - ${REPO_DIR}/LICENSE.txt - -# README.md -# README.md: WarpX Copyright (c) 2018-2021, The Regents of ... -sed -i -E "s/"\ -"(WarpX Copyright \(c\) 2018-)(.*)(, The Regents of.*)/"\ -"\1$(date +%Y)\3/g" \ - ${REPO_DIR}/README.md - # Epilog ######################################################################