aboutcode-org · pombredanne · Sep 16, 2021 · Aug 27, 2021 · Sep 15, 2021 · Sep 15, 2021
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -61,11 +61,6 @@ jobs:
                 bin/pytest -n 3 -vvs --test-suite=all \
                   tests/licensedcode/test_detection_datadriven_external.py
 
-              license_validate_basic: |
-                bin/pytest -n 3 -vvs --test-suite=validate \
-                  tests/licensedcode/test_detection_validate.py \
-                  -k TestValidateLicenseBasic
-
               license_validate_ext_1: |
                 bin/pytest -n 3 -vvs --test-suite=validate \
                   tests/licensedcode/test_detection_validate.py \

diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
@@ -1044,6 +1044,8 @@ def from_node(
     (r'^JMagnetic$', 'NN'),
     (r'^Joint$', 'NN'),
     (r'^Jsunittest$', 'NN'),
+    (r'^List$', 'NN'),
+    (r'^Set$', 'NN'),
     (r'^Last$', 'NN'),
     (r'^LAW', 'NN'),
     (r'^Legal$', 'NN'),
@@ -2215,7 +2217,7 @@ def from_node(
     COPYRIGHT: {<COPY>+  <YR-RANGE>  <NN>  <NNP>} #22792
 
     # Copyright (c) 2017 odahcam
-    COPYRIGHT: {<COPY>+  <YR-RANGE>  <NN> <ALLRIGHTRESERVED>?} #22793
+    COPYRIGHT: {<COPY>+  <YR-RANGE>  <NN>+ <ALLRIGHTRESERVED>?} #22793
 
     # Licensed material of Foobar Company, All Rights Reserved, (C) 2005
     COPYRIGHT: {<COMPANY>  <ALLRIGHTRESERVED>  <COPYRIGHT>} #22794

diff --git a/src/licensedcode/data/licenses/accellera-systemc.yml b/src/licensedcode/data/licenses/accellera-systemc.yml
@@ -7,11 +7,13 @@ homepage_url: https://www.accellera.org/images/about/policies/SystemC_Open_Sourc
 spdx_license_key: LicenseRef-scancode-accellera-systemc
 faq_url: https://accellera.org/about/policies-and-procedures
 ignorable_copyrights:
-    - (c) 1996- current
+    - (c) 1996- current year here
+    - (c) 1996- current year here by all Contributors
     - Copyright (c) 1996- current year here by all Contributors
 ignorable_authors:
     - through the Accellera working group process
 ignorable_holders:
+    - here
     - here by all Contributors
 ignorable_urls:
     - http://www.accellera.org/

diff --git a/src/licensedcode/data/licenses/sata.yml b/src/licensedcode/data/licenses/sata.yml
@@ -9,9 +9,9 @@ other_urls:
     - https://github.com/zTrix/sata-license
     - https://github.com/kongtianyi/sata-license
 ignorable_copyrights:
-    - Copyright (c) 2014 zTrix(i@ztrix.me)
+    - Copyright (c) 2014 zTrix(i@ztrix.me) kongtianyi(kongtianyi@foxmail.com)
 ignorable_holders:
-    - zTrix(i@ztrix.me)
+    - zTrix(i@ztrix.me) kongtianyi(kongtianyi@foxmail.com)
 ignorable_urls:
     - https://github.com/kongtianyi/sata-license
     - https://github.com/zTrix/sata-license

diff --git a/tests/cluecode/data/copyrights/line-set.txt b/tests/cluecode/data/copyrights/line-set.txt
@@ -0,0 +1,4 @@
+    #
+    # Copyright (c) 2007-2010 Sharon Rosner, Wayne E. Seguin, Aman Gupta, Adrian Madrid, Jeremy Evans
+    module List 
+    # Set
diff --git a/tests/cluecode/data/copyrights/line-set.txt.yml b/tests/cluecode/data/copyrights/line-set.txt.yml
@@ -0,0 +1,4 @@
+what:
+  - copyrights
+copyrights:
+  - Copyright (c) 2007-2010 Sharon Rosner, Wayne E. Seguin, Aman Gupta, Adrian Madrid, Jeremy Evans
diff --git a/tests/cluecode/data/copyrights/lines.txt b/tests/cluecode/data/copyrights/lines.txt
@@ -0,0 +1,6 @@
+Files: src/macos/src/macos_main.cpp
+Copyright: 2001, Eric Lavigne
+License: curl
+
+Files: docs/examples/rtsp.c
+Copyright: 2011, Jim Hollinger
diff --git a/tests/cluecode/data/copyrights/lines.txt.yml b/tests/cluecode/data/copyrights/lines.txt.yml
@@ -0,0 +1,5 @@
+what:
+  - copyrights
+copyrights:
+  - Copyright 2001, Eric Lavigne
+  - Copyright 2011, Jim Hollinger
diff --git a/tests/cluecode/data/copyrights/the_native_web.txt b/tests/cluecode/data/copyrights/the_native_web.txt
@@ -0,0 +1 @@
+Copyright (c) 2014-2018 the native web.
diff --git a/tests/cluecode/data/copyrights/the_native_web.txt.yml b/tests/cluecode/data/copyrights/the_native_web.txt.yml
@@ -0,0 +1,7 @@
+what:
+  - copyrights
+  - holders
+copyrights:
+  - Copyright (c) 2014-2018 the native web
+holders:
+  - the native web
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-geshi-docs/geshi-doc.html.yml b/tests/cluecode/data/ics/libvpx-examples-includes-geshi-docs/geshi-doc.html.yml
@@ -14,19 +14,19 @@ copyrights:
   - (c) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann (http://qbnz.com/highlighter/ and
     http://geshi.org/)
   - Copyright (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
-  - Copyright (c) 2008 name
+  - Copyright (c) 2008 name ( website URL )
 holders:
   - Nigel McNie, - Benny Baumann
   - Nigel McNie, - Benny Baumann
   - Nigel McNie, - Benny Baumann
   - Nigel McNie, - Benny Baumann
   - Nigel McNie, - Benny Baumann
   - Nigel McNie
-  - name
+  - name  website URL
 holders_summary:
   - value: Nigel McNie, - Benny Baumann
     count: 5
   - value: Nigel McNie
     count: 1
-  - value: name
+  - value: name website URL
     count: 1
diff --git a/tests/cluecode/data/ics/oprofile-utils/opcontrol.yml b/tests/cluecode/data/ics/oprofile-utils/opcontrol.yml
@@ -3,13 +3,13 @@ what:
   - holders
   - holders_summary
 copyrights:
-  - Copyright 2002 Read
+  - Copyright 2002 Read the
   - Copyright IBM Corporation 2007
 holders:
-  - Read
+  - Read the
   - IBM Corporation
 holders_summary:
   - value: IBM Corporation
     count: 1
-  - value: Read
+  - value: Read the
     count: 1