MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

use rapidfuzz instead of fuzzywuzzy

pull/1/head
maxbachmann 2020-03-23 02:16:36 +01:00
parent e8035863b8
commit 9388a9820f
No known key found for this signature in database
GPG Key ID: 60334E83C23820B8
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -65,6 +65,6 @@ setup(
}, },
extras_require={ extras_require={
'taxii': ['taxii2-client'], 'taxii': ['taxii2-client'],
'semantic': ['haversine', 'fuzzywuzzy'], 'semantic': ['haversine', 'rapidfuzz'],
}, },
) )

4
stix2/environment.py
View File

@ -363,8 +363,8 @@ def partial_string_based(str1, str2):
float: Number between 0.0 and 1.0 depending on match criteria. float: Number between 0.0 and 1.0 depending on match criteria.
""" """
from fuzzywuzzy import fuzz from rapidfuzz import fuzz
result = fuzz.token_sort_ratio(str1, str2, force_ascii=False) result = fuzz.token_sort_ratio(str1, str2)
logger.debug("--\t\tpartial_string_based '%s' '%s'\tresult: '%s'", str1, str2, result) logger.debug("--\t\tpartial_string_based '%s' '%s'\tresult: '%s'", str1, str2, result)
return result / 100.0 return result / 100.0

3
tox.ini
View File

@ -9,9 +9,8 @@ deps =
pytest-cov pytest-cov
coverage coverage
taxii2-client taxii2-client
fuzzywuzzy rapidfuzz
haversine haversine
python-Levenshtein
medallion medallion
commands = commands =
python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning python -m pytest --cov=stix2 stix2/test/ --cov-report term-missing -W ignore::stix2.exceptions.STIXDeprecationWarning