From c976cd397e97db1d7b73fd2327dadeaa13fb084b Mon Sep 17 00:00:00 2001 From: Toby Searle <14909402+twsearle@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:12:42 +0000 Subject: [PATCH] update license to BSD 3-clause (#61) --- .github/pull_request_template.md | 24 ++++++++++++++++ LICENSE | 28 +++++++++++++++++++ README.md | 1 + src/nemo-feedback/CMakeLists.txt | 3 +- src/nemo-feedback/NemoFeedback.cc | 4 +-- src/nemo-feedback/NemoFeedback.h | 4 +-- src/nemo-feedback/NemoFeedbackDataCreator.cc | 4 +-- src/nemo-feedback/NemoFeedbackDataCreator.h | 4 +-- .../NemoFeedbackParameterTraitsOutputDtype.cc | 4 +-- .../NemoFeedbackParameterTraitsOutputDtype.h | 4 +-- src/nemo-feedback/NemoFeedbackParameters.h | 4 +-- src/nemo-feedback/feedback_io/Data.cc | 3 -- src/nemo-feedback/feedback_io/Data.h | 3 -- src/nemo-feedback/feedback_io/DataIndexer.cc | 3 -- src/nemo-feedback/feedback_io/DataIndexer.h | 3 -- src/nemo-feedback/feedback_io/Utils.cc | 3 -- src/nemo-feedback/feedback_io/Utils.h | 3 -- src/nemo-feedback/feedback_io/Writer.cc | 5 +--- src/nemo-feedback/feedback_io/Writer.h | 5 +--- .../instantiateObsFilterFactory.h | 4 +-- src/tests/mains/TestObsFilters.cc | 4 +-- src/tests/nemo-feedback/test_feedback_data.cc | 4 +-- .../nemo-feedback/test_feedback_writer.cc | 4 +-- 23 files changed, 67 insertions(+), 61 deletions(-) create mode 100644 .github/pull_request_template.md create mode 100644 LICENSE diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..d4c2777 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,24 @@ +## Description + +Provide a detailed description of what this PR does. What problem does it fix? What new capability does it add? This is just general guidance, feel free to delete sections you don't need below as makes the most sense to you. + +## Issue(s) addressed + +Resolves # + +## Dependencies + +List the other PRs that this PR is dependent on: +- [ ] ... + +## Impact + +Expected impact on downstream repositories or workflows: + +## Checklist + +- [ ] I have updated the unit tests to cover the change +- [ ] New functions are documented briefly via Doxygen comments in the code +- [ ] I have linted my code using cpplint +- [ ] I have run the unit tests +- [ ] I have run mo-bundle to check integration with the rest of JEDI and run the unit tests under all environments diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..966d4ea --- /dev/null +++ b/LICENSE @@ -0,0 +1,28 @@ +BSD 3-Clause License + +Copyright (c) 2023, Met Office + +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. diff --git a/README.md b/README.md index 148838a..06a39da 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ nemo-feedback ============= ![CI](https://github.com/MetOffice/nemo-feedback/actions/workflows/ci.yml/badge.svg) +[![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) JEDI UFO filter for writing NEMO ocean model NetCDF feedback file format data from the UK Met Office. diff --git a/src/nemo-feedback/CMakeLists.txt b/src/nemo-feedback/CMakeLists.txt index 09203ff..c98e430 100644 --- a/src/nemo-feedback/CMakeLists.txt +++ b/src/nemo-feedback/CMakeLists.txt @@ -1,6 +1,5 @@ -# (C) Crown Copyright 2021, the Met Office. All rights reserved. +# (C) British Crown Copyright 2023 Met Office # -# Refer to COPYRIGHT.txt of this distribution for details. list( APPEND nemo_fdbk_src_files instantiateObsFilterFactory.h diff --git a/src/nemo-feedback/NemoFeedback.cc b/src/nemo-feedback/NemoFeedback.cc index f441ff5..69a5fb6 100644 --- a/src/nemo-feedback/NemoFeedback.cc +++ b/src/nemo-feedback/NemoFeedback.cc @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2020, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #include "nemo-feedback/NemoFeedback.h" diff --git a/src/nemo-feedback/NemoFeedback.h b/src/nemo-feedback/NemoFeedback.h index 77a079e..11b1163 100644 --- a/src/nemo-feedback/NemoFeedback.h +++ b/src/nemo-feedback/NemoFeedback.h @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2021, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #pragma once diff --git a/src/nemo-feedback/NemoFeedbackDataCreator.cc b/src/nemo-feedback/NemoFeedbackDataCreator.cc index 241ced6..5be709f 100644 --- a/src/nemo-feedback/NemoFeedbackDataCreator.cc +++ b/src/nemo-feedback/NemoFeedbackDataCreator.cc @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2020, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #include "nemo-feedback/NemoFeedbackDataCreator.h" diff --git a/src/nemo-feedback/NemoFeedbackDataCreator.h b/src/nemo-feedback/NemoFeedbackDataCreator.h index b5d4261..46e5037 100644 --- a/src/nemo-feedback/NemoFeedbackDataCreator.h +++ b/src/nemo-feedback/NemoFeedbackDataCreator.h @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2021, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #pragma once diff --git a/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.cc b/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.cc index 169a3ff..8bb1ea7 100644 --- a/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.cc +++ b/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.cc @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2023, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #include "nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.h" diff --git a/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.h b/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.h index 6bc4d2d..a02be67 100644 --- a/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.h +++ b/src/nemo-feedback/NemoFeedbackParameterTraitsOutputDtype.h @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2023, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #pragma once diff --git a/src/nemo-feedback/NemoFeedbackParameters.h b/src/nemo-feedback/NemoFeedbackParameters.h index e01d556..0eb0b38 100644 --- a/src/nemo-feedback/NemoFeedbackParameters.h +++ b/src/nemo-feedback/NemoFeedbackParameters.h @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2020, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #pragma once diff --git a/src/nemo-feedback/feedback_io/Data.cc b/src/nemo-feedback/feedback_io/Data.cc index 0b4f395..d620383 100644 --- a/src/nemo-feedback/feedback_io/Data.cc +++ b/src/nemo-feedback/feedback_io/Data.cc @@ -1,8 +1,5 @@ /* * (C) British Crown Copyright 2023 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. */ diff --git a/src/nemo-feedback/feedback_io/Data.h b/src/nemo-feedback/feedback_io/Data.h index 3306ff9..b5ff796 100644 --- a/src/nemo-feedback/feedback_io/Data.h +++ b/src/nemo-feedback/feedback_io/Data.h @@ -1,8 +1,5 @@ /* * (C) British Crown Copyright 2023 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. */ diff --git a/src/nemo-feedback/feedback_io/DataIndexer.cc b/src/nemo-feedback/feedback_io/DataIndexer.cc index b17f9cf..f8943bb 100644 --- a/src/nemo-feedback/feedback_io/DataIndexer.cc +++ b/src/nemo-feedback/feedback_io/DataIndexer.cc @@ -1,8 +1,5 @@ /* * (C) British Crown Copyright 2023 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. */ diff --git a/src/nemo-feedback/feedback_io/DataIndexer.h b/src/nemo-feedback/feedback_io/DataIndexer.h index 6395496..3787e57 100644 --- a/src/nemo-feedback/feedback_io/DataIndexer.h +++ b/src/nemo-feedback/feedback_io/DataIndexer.h @@ -1,8 +1,5 @@ /* * (C) British Crown Copyright 2023 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. */ diff --git a/src/nemo-feedback/feedback_io/Utils.cc b/src/nemo-feedback/feedback_io/Utils.cc index 95f0f57..609c06b 100644 --- a/src/nemo-feedback/feedback_io/Utils.cc +++ b/src/nemo-feedback/feedback_io/Utils.cc @@ -1,8 +1,5 @@ /* * (C) British Crown Copyright 2023 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. */ #include "nemo-feedback/feedback_io/Utils.h" diff --git a/src/nemo-feedback/feedback_io/Utils.h b/src/nemo-feedback/feedback_io/Utils.h index c95c1e2..38b60f7 100644 --- a/src/nemo-feedback/feedback_io/Utils.h +++ b/src/nemo-feedback/feedback_io/Utils.h @@ -1,8 +1,5 @@ /* * (C) British Crown Copyright 2023 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. */ diff --git a/src/nemo-feedback/feedback_io/Writer.cc b/src/nemo-feedback/feedback_io/Writer.cc index 67a2d80..f561130 100644 --- a/src/nemo-feedback/feedback_io/Writer.cc +++ b/src/nemo-feedback/feedback_io/Writer.cc @@ -1,8 +1,5 @@ /* - * (C) British Crown Copyright 2021 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * (C) British Crown Copyright 2023 Met Office */ #include "nemo-feedback/feedback_io/Writer.h" diff --git a/src/nemo-feedback/feedback_io/Writer.h b/src/nemo-feedback/feedback_io/Writer.h index 40a91e3..d98f64a 100644 --- a/src/nemo-feedback/feedback_io/Writer.h +++ b/src/nemo-feedback/feedback_io/Writer.h @@ -1,8 +1,5 @@ /* - * (C) British Crown Copyright 2022 Met Office - * - * This software is licensed under the terms of the Apache Licence Version 2.0 - * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * (C) British Crown Copyright 2023 Met Office */ diff --git a/src/nemo-feedback/instantiateObsFilterFactory.h b/src/nemo-feedback/instantiateObsFilterFactory.h index bd635c2..705af78 100644 --- a/src/nemo-feedback/instantiateObsFilterFactory.h +++ b/src/nemo-feedback/instantiateObsFilterFactory.h @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2020, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #pragma once diff --git a/src/tests/mains/TestObsFilters.cc b/src/tests/mains/TestObsFilters.cc index 3b40e4c..4b0d31d 100644 --- a/src/tests/mains/TestObsFilters.cc +++ b/src/tests/mains/TestObsFilters.cc @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2020, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #include "../test/ufo/ObsFilters.h" diff --git a/src/tests/nemo-feedback/test_feedback_data.cc b/src/tests/nemo-feedback/test_feedback_data.cc index 3d1d8bb..fd5e970 100644 --- a/src/tests/nemo-feedback/test_feedback_data.cc +++ b/src/tests/nemo-feedback/test_feedback_data.cc @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2021, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #include diff --git a/src/tests/nemo-feedback/test_feedback_writer.cc b/src/tests/nemo-feedback/test_feedback_writer.cc index 6340ebf..73805a3 100644 --- a/src/tests/nemo-feedback/test_feedback_writer.cc +++ b/src/tests/nemo-feedback/test_feedback_writer.cc @@ -1,7 +1,5 @@ /* - * (C) Crown Copyright 2021, the Met Office. All rights reserved. - * - * Refer to COPYRIGHT.txt of this distribution for details. + * (C) British Crown Copyright 2023 Met Office */ #include