From 3f6692701d3971339b24e1ad6bc97e4396b2e40a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Sat, 5 Oct 2024 18:19:57 -0400 Subject: [PATCH 1/5] DOC: Improve the copyright notice information Improve the copyright notice information: - Introduce a `NOTICE` file to hold the copyright information: state the original year (2021) in which works were first released and use `-present` to avoid any need to update the year at every release. - Remove the license application instructions from the `LICENSE` file. - Remove the copyright year from every other source file. --- LICENSE | 27 ------------------------- NOTICE | 6 ++++++ scripts/optimize_registration.py | 2 +- src/eddymotion/__main__.py | 2 +- src/eddymotion/cli/parser.py | 2 +- src/eddymotion/cli/run.py | 2 +- src/eddymotion/conftest.py | 2 +- src/eddymotion/exceptions.py | 2 +- src/eddymotion/math/tests/test_utils.py | 2 +- src/eddymotion/math/utils.py | 2 +- src/eddymotion/model/_dipy.py | 2 +- src/eddymotion/model/dmri.py | 2 +- src/eddymotion/registration/ants.py | 2 +- src/eddymotion/registration/utils.py | 2 +- src/eddymotion/utils.py | 2 +- test/conftest.py | 2 +- test/test_dipy.py | 2 +- test/test_dmri.py | 2 +- test/test_integration.py | 2 +- test/test_main.py | 2 +- test/test_model.py | 2 +- test/test_parser.py | 2 +- test/test_splitting.py | 2 +- test/test_version.py | 2 +- 24 files changed, 28 insertions(+), 49 deletions(-) create mode 100644 NOTICE diff --git a/LICENSE b/LICENSE index 4803a45d..dd5b3a58 100644 --- a/LICENSE +++ b/LICENSE @@ -172,30 +172,3 @@ defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [2021] [Derek Pisner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..225a28e1 --- /dev/null +++ b/NOTICE @@ -0,0 +1,6 @@ +eddymotion +Copyright 2021-present The NiPreps Developers + +This software is distributed under the Apache 2.0 License. + +See the LICENSE file in the project root for license information. diff --git a/scripts/optimize_registration.py b/scripts/optimize_registration.py index 25b6e2a5..33c990e4 100644 --- a/scripts/optimize_registration.py +++ b/scripts/optimize_registration.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/__main__.py b/src/eddymotion/__main__.py index 6cc72833..183d1dad 100644 --- a/src/eddymotion/__main__.py +++ b/src/eddymotion/__main__.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/cli/parser.py b/src/eddymotion/cli/parser.py index 5817bdba..98655f9b 100644 --- a/src/eddymotion/cli/parser.py +++ b/src/eddymotion/cli/parser.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/cli/run.py b/src/eddymotion/cli/run.py index ccb35e45..b68e83b7 100644 --- a/src/eddymotion/cli/run.py +++ b/src/eddymotion/cli/run.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/conftest.py b/src/eddymotion/conftest.py index 5d47bfc3..72a196c6 100644 --- a/src/eddymotion/conftest.py +++ b/src/eddymotion/conftest.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/exceptions.py b/src/eddymotion/exceptions.py index 44d3d906..ee21dfe6 100644 --- a/src/eddymotion/exceptions.py +++ b/src/eddymotion/exceptions.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/math/tests/test_utils.py b/src/eddymotion/math/tests/test_utils.py index 66622357..49702332 100644 --- a/src/eddymotion/math/tests/test_utils.py +++ b/src/eddymotion/math/tests/test_utils.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/math/utils.py b/src/eddymotion/math/utils.py index d241576f..f6bfc3a1 100644 --- a/src/eddymotion/math/utils.py +++ b/src/eddymotion/math/utils.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/model/_dipy.py b/src/eddymotion/model/_dipy.py index 7a97420e..a74c6ced 100644 --- a/src/eddymotion/model/_dipy.py +++ b/src/eddymotion/model/_dipy.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/model/dmri.py b/src/eddymotion/model/dmri.py index 45e4e8cd..6241fab1 100644 --- a/src/eddymotion/model/dmri.py +++ b/src/eddymotion/model/dmri.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/registration/ants.py b/src/eddymotion/registration/ants.py index 925ed1a3..149108f8 100644 --- a/src/eddymotion/registration/ants.py +++ b/src/eddymotion/registration/ants.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/registration/utils.py b/src/eddymotion/registration/utils.py index 0ac54240..03fdecfb 100644 --- a/src/eddymotion/registration/utils.py +++ b/src/eddymotion/registration/utils.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/eddymotion/utils.py b/src/eddymotion/utils.py index 07320a1e..83886e5d 100644 --- a/src/eddymotion/utils.py +++ b/src/eddymotion/utils.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/conftest.py b/test/conftest.py index 8ff434da..12002d02 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_dipy.py b/test/test_dipy.py index 54c91006..34fb352f 100644 --- a/test/test_dipy.py +++ b/test/test_dipy.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_dmri.py b/test/test_dmri.py index e0ff158d..98c89f20 100644 --- a/test/test_dmri.py +++ b/test/test_dmri.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_integration.py b/test/test_integration.py index 1e5f1a4f..11753e94 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_main.py b/test/test_main.py index 8531a3ff..6b322e7b 100644 --- a/test/test_main.py +++ b/test/test_main.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_model.py b/test/test_model.py index 2173aa3d..117b2d93 100644 --- a/test/test_model.py +++ b/test/test_model.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_parser.py b/test/test_parser.py index 83b02159..27276e8d 100644 --- a/test/test_parser.py +++ b/test/test_parser.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2024 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_splitting.py b/test/test_splitting.py index f88f8e86..99beb4d6 100644 --- a/test/test_splitting.py +++ b/test/test_splitting.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test/test_version.py b/test/test_version.py index 9ebd7a24..e73e2e86 100644 --- a/test/test_version.py +++ b/test/test_version.py @@ -1,7 +1,7 @@ # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*- # vi: set ft=python sts=4 ts=4 sw=4 et: # -# Copyright 2021 The NiPreps Developers +# Copyright The NiPreps Developers # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 0a1f56056406f33c7bab5ca9e9136cc68edd7995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Sun, 6 Oct 2024 11:32:40 -0400 Subject: [PATCH 2/5] DOC: Update `NOTICE` to contain the Apache license paragraph Update `NOTICE` to contain the Apache license notice paragraph. Co-authored-by: Chris Markiewicz --- NOTICE | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 225a28e1..beaaf31f 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,15 @@ eddymotion Copyright 2021-present The NiPreps Developers -This software is distributed under the Apache 2.0 License. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may find a copy of the License in the LICENSE file of the +project root or obtain a copy of the License at -See the LICENSE file in the project root for license information. + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. From ff057846533baddc5f05d90270e418247c3f2396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Fri, 18 Oct 2024 09:43:44 +0200 Subject: [PATCH 3/5] DOC: Update NOTICE file text The `NOTICE` file text is not a repetition of the license banner, but clarifications about the licensing of the code (e.g., if in the past had other licenses, or if it derives from pre-exiting code). Thus, remove the license information and edit the text to reflect the copyright of the code. Co-authored-by: Oscar Esteban --- NOTICE | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/NOTICE b/NOTICE index beaaf31f..a71b3e0a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,15 +1,6 @@ eddymotion -Copyright 2021-present The NiPreps Developers +Copyright The NiPreps Developers. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may find a copy of the License in the LICENSE file of the -project root or obtain a copy of the License at +This product includes software developed by +the NiPreps Community (https://nipreps.org/). - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. From 8340d379d2387e97094eb7abfb903ac28ac4ddf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Fri, 18 Oct 2024 03:48:02 -0400 Subject: [PATCH 4/5] DOC: Specify years in the copyright text of the `NOTICE` file Specify years in the copyright text of the `NOTICE` file. --- NOTICE | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index a71b3e0a..261d618b 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,5 @@ eddymotion -Copyright The NiPreps Developers. +Copyright 2021-present The NiPreps Developers. This product includes software developed by the NiPreps Community (https://nipreps.org/). - From a29ab260b60cb9a426daa0e72acec153f428ae79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Haitz=20Legarreta=20Gorro=C3=B1o?= Date: Fri, 18 Oct 2024 09:57:21 +0200 Subject: [PATCH 5/5] DOC: Remove "present" as ending year from copyright NOTICE Remove "present" as ending year from copyright NOTICE: it does not add relevant information/it is implicit. Co-authored-by: Oscar Esteban --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 261d618b..c1f37ee2 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ eddymotion -Copyright 2021-present The NiPreps Developers. +Copyright 2021 The NiPreps Developers. This product includes software developed by the NiPreps Community (https://nipreps.org/).