Merge pull request #377 from maxbachmann-forks/master

use rapidfuzz instead of fuzzywuzzy

.travis.yml

@@ -1,7 +1,7 @@
 os: linux
 language: python
 cache: pip
-dist: xenial
+dist: bionic
 python:
   - "3.5"
   - "3.6"

setup.py

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

stix2/environment.py

@@ -364,8 +364,8 @@ def partial_string_based(str1, str2):
         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 = round(fuzz.token_sort_ratio(str1, str2))
     logger.debug("--\t\tpartial_string_based '%s' '%s'\tresult: '%s'", str1, str2, result)
     return result / 100.0
 

tox.ini

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