Merge pull request #1384 from nexB/new-and-improved-license-rules-02-18

Add new and improved licenses, rules and tests

Author: pombredanne

.travis.yml

@@ -14,7 +14,9 @@ env:
     - TEST_SUITE="$PYTEST --ignore=tests/scancode --ignore=tests/extractcode --ignore=tests/licensedcode --ignore=tests/cluecode --ignore=tests/packagedcode"
     - TEST_SUITE="$PYTEST tests/scancode"
     - TEST_SUITE="$PYTEST tests/extractcode"
-    - TEST_SUITE="$PYTEST tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py"
+    - TEST_SUITE="$PYTEST tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py --ignore=tests/licensedcode/test_detection_datadriven_more.py --ignore=tests/licensedcode/test_detection_datadriven.py"
+    - TEST_SUITE="$PYTEST tests/licensedcode/test_detection_datadriven.py"
+    - TEST_SUITE="$PYTEST tests/licensedcode/test_detection_datadriven_more.py"
     - TEST_SUITE="$PYTEST tests/licensedcode/test_zzzz_cache.py"
     - TEST_SUITE="$PYTEST tests/cluecode"
     - TEST_SUITE="$PYTEST tests/packagedcode"
@@ -58,7 +60,22 @@ matrix:
       python:
       osx_image: xcode7.3
     - os: osx
-      env: TEST_SUITE="$PYTEST tests/licensedcode"
+      env: TEST_SUITE="$PYTEST tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py --ignore=tests/licensedcode/test_detection_datadriven_more.py --ignore=tests/licensedcode/test_detection_datadriven.py"
+      language: generic
+      python:
+      osx_image: xcode7.3
+    - os: osx
+      env: TEST_SUITE="$PYTEST tests/licensedcode/test_detection_datadriven.py"
+      language: generic
+      python:
+      osx_image: xcode7.3
+    - os: osx
+      env: TEST_SUITE="$PYTEST tests/licensedcode/test_detection_datadriven_more.py""
+      language: generic
+      python:
+      osx_image: xcode7.3
+    - os: osx
+      env: TEST_SUITE="$PYTEST tests/licensedcode/test_zzzz_cache.py"
       language: generic
       python:
       osx_image: xcode7.3

appveyor.yml

@@ -5,7 +5,9 @@ environment:
         - TEST_SUITE: "py.test -n 2 -vvs --ignore=tests/scancode --ignore=tests/extractcode --ignore=tests/licensedcode --ignore=tests/cluecode --ignore=tests/packagedcode"
         - TEST_SUITE: "py.test -n 2 -vvs tests/scancode"
         - TEST_SUITE: "py.test -n 2 -vvs tests/extractcode"
-        - TEST_SUITE: "py.test -n 2 -vvs tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py"
+        - TEST_SUITE: "py.test -n 2 -vvs tests/licensedcode --ignore=tests/licensedcode/test_zzzz_cache.py --ignore=tests/licensedcode/test_detection_datadriven_more.py --ignore=tests/licensedcode/test_detection_datadriven.py"
+        - TEST_SUITE: "py.test -n 2 -vvs tests/licensedcode/test_detection_datadriven.py"
+        - TEST_SUITE: "py.test -n 2 -vvs tests/licensedcode/test_detection_datadriven_more.py"
         - TEST_SUITE: "py.test -vvs tests/licensedcode/test_zzzz_cache.py"
         - TEST_SUITE: "py.test -n 2 -s tests/cluecode"
         - TEST_SUITE: "py.test -n 2 -s tests/packagedcode"

src/cluecode/copyrights.py

@@ -1771,22 +1771,30 @@ def prep_line(line):
     return line, chars_only.strip()
 
 
-def is_candidate(prepped_line):
+is_only_digit_and_punct = re.compile('^[^A-Za-z]+$').match
+
+
+def is_candidate(prepared_line):
     """
-    Return True if a prepped line is a candidate line for copyright detection
+    Return True if a prepared line is a candidate line for copyright detection
     """
-    if not prepped_line:
+    if not prepared_line:
         return False
-    if copyrights_hint.years(prepped_line):
-        # if TRACE: logger_debug('is_candidate: year in line:\n%(line)r' % locals())
+
+    if is_only_digit_and_punct(prepared_line):
+        if TRACE: logger_debug('is_candidate: is_only_digit_and_punct:\n%(prepared_line)r' % locals())
+        return False
+
+    if copyrights_hint.years(prepared_line):
+        # if TRACE: logger_debug('is_candidate: year in line:\n%(prepared_line)r' % locals())
         return True
     else:
-        # if TRACE: logger_debug('is_candidate: NOT year in line:\n%(line)r' % locals())
+        # if TRACE: logger_debug('is_candidate: NOT year in line:\n%(prepared_line)r' % locals())
         pass
 
     for marker in copyrights_hint.statement_markers:
-        if marker in prepped_line:
-            # if TRACE: logger_debug('is_candidate: %(marker)r in line:\n%(line)r' % locals())
+        if marker in prepared_line:
+            # if TRACE: logger_debug('is_candidate: %(marker)r in line:\n%(prepared_line)r' % locals())
             return True
 
 

src/cluecode/finder.py

@@ -206,8 +206,9 @@ def urls_regex():
 
 def find_urls(location, unique=True):
     """
-    Yield urls found in file at location.
+    Yield urls found in file at `location`.
     Only return unique items if unique is True.
+    `location` can be a list of strings for testing.
     """
     patterns = [('urls', urls_regex(),)]
     matches = find(location, patterns)

src/cluecode/finder_data.py

@@ -131,9 +131,11 @@ def set_from_text(text):
     http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd
     http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd
     http://gcc.gnu.org/bugs.html
+    http://nsis.sf.net/NSIS_Error
 ''')
 
-JUNK_URL_PREFIXES = tuple(set_from_text('''
+
+JUNK_URL_PREFIXES = tuple(sorted(set_from_text('''
     http://www.springframework.org/dtd/
     http://www.slickedit.com/dtd/
     http://www.oexchange.org/spec/0.8/
@@ -175,13 +177,28 @@ def set_from_text(text):
     https://www.w3.org/XML/1998/namespace
     http://www.w3.org/2000/xmlns/
     https://www.w3.org/2000/xmlns/
-'''))
-
-JUNK_DOMAIN_SUFFIXES = tuple(set_from_text('''
+    http://ts-aia.ws.symantec.com/
+    https://ts-aia.ws.symantec.com/
+    https://www.verisign.com/rpa
+    http://csc3-2010-crl.verisign.com/
+    https://www.verisign.com/rpa
+    http://csc3-2010-aia.verisign.com/
+    https://www.verisign.com/cps
+    http://logo.verisign.com/
+    http://ocsp2.globalsign.com/
+    http://crl.globalsign.com/
+    http://secure.globalsign.com/cacert/
+    https://www.globalsign.com/repository/
+    http://www.microsoft.com/pki/certs/
+    http://www.microsoft.com/pkiops/crl
+    http://www.microsoft.com/PKI/
+''')))
+
+JUNK_DOMAIN_SUFFIXES = tuple(sorted(set_from_text('''
    .png
    .jpg
    .gif
-'''))
+''')))
 
 
 def classify(s, data_set, suffixes=None):

src/commoncode/text.py

@@ -194,13 +194,17 @@ def python_safe_name(s):
 
     For example:
     >>> s = "not `\\a /`good` -safe name ??"
-    >>> assert python_safe_name(s) == 'not_good_safe_name'
+    >>> assert python_safe_name(s) == 'not______good___safe_name'
+    >>> s1 = "string1++or+"
+    >>> s2 = "string1 +or "
+    >>> assert python_safe_name(s1) == python_safe_name(s2)
     """
     s = toascii(s)
     s = foldcase(s)
     s = nopunctuation(s)
-    s = s.strip()
+    s = s.replace(' ', '_')
     s = '_'.join(s.split())
+    s = s.strip('_')
     return s
 
 

src/licensedcode/data/licenses/alfresco-exception-0.5.LICENSE

@@ -0,0 +1,60 @@
+Alfresco Software, Ltd. FLOSS License Exception
+
+ The Alfresco Software, Ltd. Exception for Free/Libre and Open Source Software-only Applications Using Alfresco software (the `FLOSS Exception').
+
+Version 0.5, 30 August 2006
+Exception Intent
+
+We want specified Free/Libre and Open Source Software ("FLOSS") applications to be able to use specified GPL-licensed Alfresco software (the "Program") despite the fact that not all FLOSS licenses are compatible with version 2 of the GNU General Public License (the "GPL").
+Legal Terms and Conditions
+
+As a special exception to the terms and conditions of version 2.0 of the GPL:
+
+You are free to distribute a Derivative Work that is formed entirely from the Program and one or more works (each, a "FLOSS Work") licensed under one or more of the licenses listed below in section 1, as long as:
+
+    You obey the GPL in all respects for the Program and the Derivative Work, except for identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
+    all identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
+        are distributed subject to one of the FLOSS licenses listed below, and
+        the object code or executable form of those sections are accompanied by the complete corresponding machine-readable source code for those sections on the same medium and under the same FLOSS license as the corresponding object code or executable forms of those sections, and
+    any works which are aggregated with the Program or with a Derivative Work on a volume of a storage or distribution medium in accordance with the GPL, can reasonably be considered independent and separate works in themselves which are not derivatives of either the Program, a Derivative Work or a FLOSS Work.
+
+If the above conditions are not met, then the Program may only be copied, modified, distributed or used under the terms and conditions of the GPL or another valid licensing option from Alfresco Software, Ltd.
+1. FLOSS License List
+License name	Version(s)/Copyright Date
+Academic Free License 	2.0
+Apache Software License 	1.0/1.1/2.0
+Apple Public Source License 	2.0
+Artistic license 	From Perl 5.8.0
+BSD license 	"July 22 1999"
+Common Development and Distribution License (CDDL) 	1.0
+Common Public License 	1.0
+GNU Library or "Lesser" General Public License (LGPL) 	2.0/2.1
+Jabber Open Source License 	1.0
+MIT License (As listed in file MIT-License.txt) 	-
+Mozilla Public License (MPL) 	1.0/1.1
+Open Software License 	2.0
+OpenSSL license (with original SSLeay license) 	"2003" ("1998")
+PHP License 	3.0
+Python license (CNRI Python License) 	-
+Python Software Foundation License 	2.1.1
+Sleepycat License 	"1999"
+University of Illinois/NCSA Open Source License 	-
+W3C License 	"2001"
+X11 License 	"2001"
+Zlib/libpng License 	-
+Zope Public License 	2.0
+
+Due to the many variants of some of the above licenses, we require that any version follow the 2003 version of the Free Software Foundation's Free Software Definition (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of the Open Source Definition by the Open Source Initiative (http://www.opensource.org/docs/definition.php).
+2. Definitions
+
+    Terms used, but not defined, herein shall have the meaning provided in the GPL.
+    Derivative Work means a derivative work under copyright law.
+
+3. Applicability
+
+This FLOSS Exception applies to all Programs that contain a notice placed by Alfresco Software, Ltd. saying that the Program may be distributed under the terms of this FLOSS Exception. If you create or distribute a work which is a Derivative Work of both the Program and any other work licensed under the GPL, then this FLOSS Exception is not available for that work; thus, you must remove the FLOSS Exception notice from that work and comply with the GPL in all respects, including by retaining all GPL notices. You may choose to redistribute a copy of the Program exclusively under the terms of the GPL by removing the FLOSS Exception notice from that copy of the Program, provided that the copy has never been modified by you or any third party.
+Appendix A. Qualified Libraries and Packages
+
+The following is a a non-exhaustive list of libraries and packages which are covered by the FLOSS License Exception. Please note that appendix is merely provided as an additional service to specific FLOSS projects who wish to simplify licensing information for their users. Compliance with one of the licenses noted under the "FLOSS license list" section remains a prerequisite.
+Package name	Qualifying License and Version
+Apache Portable Runtime (APR) 	Apache Software License 2.0

src/licensedcode/data/licenses/alfresco-exception-0.5.yml

@@ -0,0 +1,6 @@
+key: alfresco-exception-0.5
+name: Alfresco FLOSS Exception v0.5
+short_name: Alfresco FLOSS Exception v0.5
+category: Copyleft
+owner: Alfresco
+homepage_url: https://web.archive.org/web/20070306001556/http://www.alfresco.com/legal/licensing/floss_exception/

src/licensedcode/data/licenses/blitz-artistic.LICENSE

@@ -0,0 +1,83 @@
+The `Blitz++ Artistic License'
+(with thanks and apologies to authors of the Perl Artistic License)
+
+Preamble
+
+The intent of this document is to state the conditions under which 
+Blitz++ may be copied, such that the authors maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and
+distribute Blitz++ in a more-or-less customary fashion, plus the
+right to make reasonable modifications.
+
+Definitions
+
+`Library' refers to the collection of files distributed by the
+Copyright Holder, and derivatives of that collection of files
+created through textual modification.
+
+`Standard Version' refers to such a Library if it has not been
+modified, or has been modified in accordance with the wishes of the
+Copyright Holder as specified below.
+
+Copyright Holder' is whoever is named in the copyright or
+copyrights for the package.
+
+`You' is you, if you're thinking about copying, modifying or
+distributing this Library.
+
+`Freely Available' means that no fee is charged for the item.
+It also means that recipients of the item may redistribute it 
+under the same conditions they received it.
+
+``Reasonable copying fee'' is whatever you can justify on the basis
+of media cost, duplication charges, time of people involved, and so
+on. (You will not be required to justify it to the Copyright Holder,
+but only to the computing community at large as a market that must
+bear the fee.)
+
+1. You may make and give away verbatim copies of the 
+Standard Version of this Library without restriction, provided that
+you duplicate all of the original copyright notices, this license,
+and associated disclaimers. 
+
+2. The Standard Version of the Library may be distributed as part
+of a collection of software, provided no more than a reasonable
+copying fee is charged for the software collection.
+
+3. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder. A
+Library modified in such a way shall still be considered the
+Standard Version.
+
+4. You may otherwise modify your copy of this Library in any way,
+provided that you insert a prominent notice in each changed file
+stating how and when you changed that file, and provided that you do
+at least ONE of the following:
+
+a. place your modifications in the Public Domain or otherwise
+make them Freely Available, such as by posting said
+modifications to the Blitz++ development list, 
+and allowing the Copyright Holder to include
+your modifications in the Standard Version of the Library.
+
+b. use the modified Library only within your corporation or
+organization. 
+
+c. make other distribution arrangements with the Copyright
+Holder.
+
+5. You may distribute programs which use this Library
+in object code or executable form without restriction.
+
+6. Any object code generated as a result of using this Library 
+does not fall under the copyright of this Library, but
+belongs to whomever generated it, and may be sold commercially.
+
+7. The name of the Copyright Holder or the Library may not be used to 
+endorse or promote products derived from this software without 
+specific prior written permission.
+
+8. THIS PACKAGE IS PROVIDED `AS IS' AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

src/licensedcode/data/licenses/blitz-artistic.yml

@@ -0,0 +1,9 @@
+key: blitz-artistic
+short_name: Blitz++ Artistic
+name: Blitz++ Artistic License
+category: Copyleft Limited
+owner: Blitz++
+homepage_url: https://github.com/blitzpp/blitz
+notes:  This is a modified artistic license, no longer in use.
+text_urls:
+    - https://raw.githubusercontent.com/blitzpp/blitz/e3c973d68e5ee17aec779bf9711b38fd4afc355f/LICENSE