mdk
/
licensename
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-splitting correctly between zlib-acknoledgement and zlib.

This commit is contained in:
Julien Palard 2017-05-14 23:42:34 +02:00
parent b4237b2d01
commit a738aa20ea
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/licensename/known_licenses.py
View File

@ -198,6 +198,8 @@ LICENSE_TREE = (
("mozilla public license", (
("version 2.0", "MPL-2.0"),
("version 1.0", "MPL-1.0"),
("wwwmozillaorg", (
("version 10", "MPL-1.0"),)),
("version 1.1", "MPL-1.1"))),
("no limit public license", "NLPL"),
("this file was added by clea f. rees on 2008/11/30 with the permission of dean guenther and pointers to this file were added to all source files.", "Wsuipa"),
@ -334,8 +336,11 @@ LICENSE_TREE = (
("portions of this software were developed by the unidata program at the university corporation for atmospheric research.", "NetCDF"),
("this file may be freely copied and redistributed as long as:", "Afmparse"),
("this software is provided 'as-is', without any express or implied warranty. in no event will the authors be held liable for any damages arising from the use of this software.", (
("source versions may not be \"relicensed\" under a different license", "Cube"),
("permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:", "zlib-like"),)),
("permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:", (
("source versions may not be \"relicensed\" under a different license", "Cube"),
("an acknowledgment in the product documentation would be appreciated but is not required.", "Zlib"),
("an acknowledgment (see the following) in the product documentation is required.", "zlib-acknowledgement")
)),)),
("eiffel forum license,", (
("version 2", "EFL-2.0"),
("version 1", "EFL-1.0"))),

12
tests/licenses/zlib-like.txt → tests/licenses/zlib-acknowledgement.txt
View File

@ -1,24 +1,14 @@
Copyright (c) 2002-2007 Charlie Poole
Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
Copyright (c) 2000-2002 Philip A. Craig
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
Portions Copyright (c) 2002-2007 Charlie Poole or Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright (c) 2000-2002 Philip A. Craig
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

0
tests/licenses/zlib-like~1.txt → tests/licenses/zlib-acknowledgement~Nunit.txt
View File

2
tests/test_licensename.py
View File

@ -21,7 +21,7 @@ FIXTURE_DIR = os.path.join(
"license_file,license_name",
[(license_file,
os.path.basename(
re.sub(r'(~[0-9]+)?\.txt', '', license_file))) for
re.sub(r'(~[0-9a-zA-Z]+)?\.txt', '', license_file))) for
license_file in
glob.glob(os.path.join(FIXTURE_DIR, '*.txt'))])
def test_files(license_file, license_name):