Merge pull request #83 from maxbachmann/master

update rapidfuzz
life4 · Aug 21, 2022 · 31fc1d9 · 31fc1d9
2 parents 6e62046 + a4af04e
commit 31fc1d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
         'numpy',                    # for SmithWaterman and other
         'python-Levenshtein',       # for Jaro and Levenshtein
         'pyxDamerauLevenshtein',    # for DamerauLevenshtein
-        'rapidfuzz>=2.0.0',         # for Jaro, Levenshtein and other
+        'rapidfuzz>=2.6.0',         # for Jaro, Levenshtein and other
     ],
 
     # needed for benchmarking, optimization and testing
@@ -23,7 +23,7 @@
         'numpy',
         'python-Levenshtein',
         'pyxDamerauLevenshtein',
-        'rapidfuzz>=2.0.0',
+        'rapidfuzz>=2.6.0',
         # slow
         'distance',
         'pylev',
@@ -40,26 +40,27 @@
 
     # for algos, from fastest to slowest, only faster than textdistance:
     'DamerauLevenshtein': [
+        'rapidfuzz>=2.6.0',         # any iterators of hashable elements
         'jellyfish',                # only for text
         'pyxDamerauLevenshtein',    # for any iterators
     ],
     'Hamming': [
         'python-Levenshtein',   # only same length and strings
-        'rapidfuzz>=2.0.0',     # only same length, any iterators of hashable elements
+        'rapidfuzz>=2.6.0',     # only same length, any iterators of hashable elements
         'jellyfish',            # only strings, any length
         'distance',             # only same length, any iterators
         'abydos',               # any iterators
     ],
     'Jaro': [
-        'rapidfuzz>=2.0.0',     # any iterators of hashable elements
+        'rapidfuzz>=2.6.0',     # any iterators of hashable elements
         'python-Levenshtein',   # only text
     ],
     'JaroWinkler': [
-        'rapidfuzz>=2.0.0',     # any iterators of hashable elements
+        'rapidfuzz>=2.6.0',     # any iterators of hashable elements
         'jellyfish',            # only text
     ],
     'Levenshtein': [
-        'rapidfuzz>=2.0.0',     # any iterators of hashable elements
+        'rapidfuzz>=2.6.0',     # any iterators of hashable elements
         'python-Levenshtein',   # only text
         # yeah, other libs slower than textdistance
     ],

diff --git a/textdistance/libraries.json b/textdistance/libraries.json
@@ -1,5 +1,9 @@
 {
   "DamerauLevenshtein": [
+    [
+      "rapidfuzz.distance.DamerauLevenshtein",
+      "distance"
+    ],
     [
       "jellyfish",
       "damerau_levenshtein_distance"

diff --git a/textdistance/libraries.py b/textdistance/libraries.py
@@ -154,6 +154,7 @@ class SameLengthTextLibrary(SameLengthLibrary, TextLibrary):
 prototype.register('DamerauLevenshtein', LibraryBase('abydos.distance', 'DamerauLevenshtein'))
 prototype.register('DamerauLevenshtein', LibraryBase('pyxdameraulevenshtein', 'damerau_levenshtein_distance'))
 prototype.register('DamerauLevenshtein', TextLibrary('jellyfish', 'damerau_levenshtein_distance'))
+prototype.register('DamerauLevenshtein', LibraryBase('rapidfuzz.distance.DamerauLevenshtein', 'distance'))
 
 prototype.register('Hamming', LibraryBase('abydos.distance', 'Hamming'))
 prototype.register('Hamming', SameLengthLibrary('distance', 'hamming'))