Merge branch 'author-name-email' into prep-release-31-2

pombredanne · pombredanne · commit 1e41310b806c · 2022-10-05T08:17:35.000+02:00
diff --git a/setup-mini.cfg b/setup-mini.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = scancode-toolkit-mini
-version = 31.1.1
+version = 31.2.0
 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
 
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = scancode-toolkit
-version = 31.1.1
+version = 31.2.0
 license = Apache-2.0 AND CC-BY-4.0 AND LicenseRef-scancode-other-permissive AND LicenseRef-scancode-other-copyleft
 
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390
diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
@@ -2620,6 +2620,9 @@ def build_detection_from_node(
     # author (Panagiotis Tsirigotis)
     AUTHOR: {<AUTH>  <NNP><NNP>+} #author Foo Bar
 
+    # Author: Tim (xtimor@gmail.com)
+    AUTHOR: {<AUTH>  <NNP>+ <EMAIL>+} #Author Foo joe@email.com
+
 
 #######################################
 # Mixed AUTHOR and COPYRIGHT
diff --git a/src/licensedcode/data/licenses/nortel-dasa.yml b/src/licensedcode/data/licenses/nortel-dasa.yml
@@ -6,3 +6,6 @@ owner: Unspecified
 spdx_license_key: LicenseRef-scancode-nortel-dasa
 ignorable_emails:
     - frank@comsys.dofn.de
+ignorable_authors:
+    - F.Schnekenbuehl <frank@comsys.dofn.de>
+
diff --git a/src/licensedcode/data/rules/nortel-dasa_1.yml b/src/licensedcode/data/rules/nortel-dasa_1.yml
@@ -3,3 +3,6 @@ is_license_text: yes
 relevance: 100
 ignorable_emails:
     - frank@comsys.dofn.de
+ignorable_authors:
+    - F.Schnekenbuehl <frank@comsys.dofn.de>
+
diff --git a/src/scancode_config.py b/src/scancode_config.py
@@ -77,7 +77,7 @@ def _create_dir(location):
 
 # in case package is not installed or we do not have setutools/pkg_resources
 # on hand fall back to this version
-__version__ = '31.1.0'
+__version__ = '31.2.0'
 
 # used to warn user when the version is out of date
 __release_date__ = datetime.datetime(2022, 8, 29)
diff --git a/tests/cluecode/data/copyrights/author-name-email.txt b/tests/cluecode/data/copyrights/author-name-email.txt
@@ -0,0 +1,4 @@
+ * NMEA library
+ * URL: http://nmea.sourceforge.net
+ * Author: Tim (xtimor@gmail.com)
+
diff --git a/tests/cluecode/data/copyrights/author-name-email.txt.yml b/tests/cluecode/data/copyrights/author-name-email.txt.yml
@@ -0,0 +1,4 @@
+what:
+  - authors
+authors:
+  - Tim (xtimor@gmail.com)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +what:
 +  - authors
 +authors:
 +  - Tim (xtimor@gmail.com)