Skip to content

Commit 729682e

Browse files
committed
Improve licensing
This commit - Puts short licenses (MIT/BSD/ISC) in both README and LICENSE - Puts a license grant for the longer licenses (Apache and GPL) into README.rst, and the license text in LICENSE - Makes GitHub recognise the Apache License, due to the above change - Updates the NOTICE file to include an attribution, rather than a copyright statement - Renames the GPL option to GPLv3 or later, as some people don't want the "or later" part - Restores the original generic how-to-apply text in the root LICENSE file
1 parent 90273fe commit 729682e

6 files changed

Lines changed: 921 additions & 27 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2018 Netherlands eScience Center
189+
Copyright [yyy] [name of copyright owner]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

cookiecutter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"project_short_description": "",
55
"version": "0.1.0",
66
"github_organization": "",
7-
"open_source_license": ["Apache Software License 2.0", "MIT license", "BSD license", "ISC license", "GNU General Public License v3", "Not open source"],
7+
"open_source_license": ["Apache Software License 2.0", "MIT license", "BSD license", "ISC license", "GNU General Public License v3 or later", "Not open source"],
88
"Python_version": ["Python 3", "Python 2 and 3", "Python 2"],
99
"apidoc": ["no", "yes"],
1010
"full_name": "John Smith",

0 commit comments

Comments
 (0)