ecmwf-projects · malmans2 · Jun 20, 2022 · Jun 20, 2022 · Jun 20, 2022 · Jun 20, 2022
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2022 European Centre for Medium-Range Weather Forecasts
 
    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/README.md b/README.md
@@ -1,5 +1,7 @@
 # cookiecutter-conda-package
 
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+
 Template for Python packages based on Conda.
 
 This package is developed to ease development of ECMWF packages, but it is intended to
@@ -81,17 +83,11 @@ make template-update
 ## License
 
 ```
-Copyright 2022, European Centre for Medium-Range Weather Forecasts (ECMWF).
-
-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
+(C) Copyright 2022 ECMWF.
 
-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.
+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.
+In applying this licence, ECMWF does not waive the privileges and immunities
+granted to it by virtue of its status as an intergovernmental organisation
+nor does it submit to any jurisdiction.
 ```
diff --git a/{{cookiecutter.project_name}}/Dockerfile b/{{cookiecutter.project_name}}/Dockerfile
@@ -1,3 +1,12 @@
+# (C) Copyright {{ cookiecutter.copyright_year }} {{ cookiecutter.copyright_holder }}.
+#
+# 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.
+# In applying this licence, {{ cookiecutter.copyright_holder }} does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+#
+
 FROM continuumio/miniconda3
 
 COPY . /srv

diff --git a/{{cookiecutter.project_name}}/LICENSE b/{{cookiecutter.project_name}}/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {{ cookiecutter.copyright_year }} {{ cookiecutter.copyright_holder }}.
 
    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/{{cookiecutter.project_name}}/Makefile b/{{cookiecutter.project_name}}/Makefile
@@ -1,3 +1,12 @@
+# (C) Copyright {{ cookiecutter.copyright_year }} {{ cookiecutter.copyright_holder }}.
+#
+# 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.
+# In applying this licence, {{ cookiecutter.copyright_holder }} does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+#
+
 PROJECT := {{ cookiecutter.project_slug }}
 CONDA := conda
 CONDAFLAGS :=

diff --git a/{{cookiecutter.project_name}}/README.md b/{{cookiecutter.project_name}}/README.md
@@ -1,5 +1,7 @@
 # {{ cookiecutter.project_name }}
 
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
+
 {{ cookiecutter.project_short_description }}
 
 ## Workflow for developers/contributors
@@ -23,17 +25,11 @@ Before pushing to GitHub, run the following commands:
 ## License
 
 ```
-Copyright {{ cookiecutter.copyright_year }}, {{ cookiecutter.copyright_holder }}.
-
-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
+(C) Copyright {{ cookiecutter.copyright_year }} {{ cookiecutter.copyright_holder }}.
 
-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.
+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.
+In applying this licence, {{ cookiecutter.copyright_holder }} does not waive the privileges and immunities
+granted to it by virtue of its status as an intergovernmental organisation
+nor does it submit to any jurisdiction.
 ```
diff --git a/{{cookiecutter.project_name}}/tests/test_00_version.py b/{{cookiecutter.project_name}}/tests/test_00_version.py
@@ -1,3 +1,11 @@
+# (C) Copyright {{ cookiecutter.copyright_year }} {{ cookiecutter.copyright_holder }}.
+# 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.
+# In applying this licence, {{ cookiecutter.copyright_holder }} does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
+#
+
 import {{ cookiecutter.project_slug }}
 
 

diff --git a/{{cookiecutter.project_name}}/{{cookiecutter.project_slug}}/__init__.py b/{{cookiecutter.project_name}}/{{cookiecutter.project_slug}}/__init__.py
@@ -1,16 +1,10 @@
-# Copyright {{ cookiecutter.copyright_year }}, {{ cookiecutter.copyright_holder }}.
+# (C) Copyright {{ cookiecutter.copyright_year }} {{ cookiecutter.copyright_holder }}.
+# 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.
+# In applying this licence, {{ cookiecutter.copyright_holder }} does not waive the privileges and immunities
+# granted to it by virtue of its status as an intergovernmental organisation
+# nor does it submit to any jurisdiction.
 #
-# 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.
 
 try:
     # NOTE: the `version.py` file must not be present in the git repository