summaryrefslogtreecommitdiffstats
path: root/identify
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-20 22:23:07 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-04-19 13:23:03 +0000
commit3987287625ccf6af585dc47dd7016b561e710a42 (patch)
tree142581a822dd9ab7a5088c749c5cff26f488ce50 /identify
parentReleasing debian version 2.1.2-1. (diff)
downloadidentify-3987287625ccf6af585dc47dd7016b561e710a42.tar.xz
identify-3987287625ccf6af585dc47dd7016b561e710a42.zip
Merging upstream version 2.2.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'identify')
-rw-r--r--identify/extensions.py2
-rw-r--r--identify/identify.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/identify/extensions.py b/identify/extensions.py
index 48864fc..d5a1627 100644
--- a/identify/extensions.py
+++ b/identify/extensions.py
@@ -226,6 +226,7 @@ NAMES = {
'.bash_aliases': EXTENSIONS['bash'],
'.bash_profile': EXTENSIONS['bash'],
'.bashrc': EXTENSIONS['bash'],
+ '.bazelrc': {'text', 'bazelrc'},
'.bowerrc': EXTENSIONS['json'] | {'bowerrc'},
'.browserslistrc': {'text', 'browserslistrc'},
'.clang-format': EXTENSIONS['yaml'],
@@ -261,6 +262,7 @@ NAMES = {
'COPYING': EXTENSIONS['txt'],
'Dockerfile': {'text', 'dockerfile'},
'Gemfile': EXTENSIONS['rb'],
+ 'Gemfile.lock': {'text'},
'Jenkinsfile': {'text', 'groovy'},
'LICENSE': EXTENSIONS['txt'],
'MAINTAINERS': EXTENSIONS['txt'],
diff --git a/identify/identify.py b/identify/identify.py
index 52d2c2d..59bc6ba 100644
--- a/identify/identify.py
+++ b/identify/identify.py
@@ -240,7 +240,7 @@ def license_id(filename: str) -> Optional[str]:
3. check exact text match with existing licenses
4. failing that use edit distance
"""
- import editdistance # `pip install identify[license]`
+ import editdistance_s # `pip install identify[license]`
with open(filename, encoding='UTF-8') as f:
contents = f.read()
@@ -260,7 +260,7 @@ def license_id(filename: str) -> Optional[str]:
if norm and abs(len(norm) - len(norm_license)) / len(norm) > .05:
continue
- edit_dist = editdistance.eval(norm, norm_license)
+ edit_dist = editdistance_s.distance(norm, norm_license)
if edit_dist < min_edit_dist:
min_edit_dist = edit_dist
min_edit_dist_spdx = spdx