Merge branch 'master' into josegonzalez-patch-1

.travis.yml

@@ -13,10 +13,13 @@ matrix:
     env: TEST_SUITE=py.test
   - python: "pypy3.5-5.8.0"
     env: TEST_SUITE="py.test test_fuzzywuzzy.py test_fuzzywuzzy_pytest.py"
+  - python: 3.6
+    env: TEST_SUITE="python setup.py check --restructuredtext --strict --metadata"
 install:
-  - pip install pytest==3.2.5 pycodestyle
-  - if [ $TRAVIS_PYTHON_VERSION != "pypy3" ]; then pip install hypothesis; fi;
+  - pip install -U pip setuptools wheel
+  - pip install pytest==3.2.5 pycodestyle docutils Pygments hypothesis
 script:
   - $TEST_SUITE
 notifications:
   on_success: always
+cache: pip

README.rst

@@ -15,7 +15,7 @@ Requirements
    Matching, though may result in `differing results for certain cases <https://github.com/seatgeek/fuzzywuzzy/issues/128>`_)
 
 For testing
------------
+~~~~~~~~~~~
 -  pycodestyle
 -  hypothesis
 -  pytest
@@ -134,3 +134,8 @@ FuzzyWuzzy is being ported to other languages too! Here are a few ports we know
 -  Rust: `fuzzyrusty (Rust port) <https://github.com/logannc/fuzzyrusty>`_
 -  JavaScript: `fuzzball.js (JavaScript port) <https://github.com/nol13/fuzzball.js>`_
 -  C++: `Tmplt/fuzzywuzzy <https://github.com/Tmplt/fuzzywuzzy>`_
+-  C#: `fuzzysharp (.Net port) <https://github.com/BoomTownRoi/BoomTown.FuzzySharp>`_
+-  Go: `go-fuzzywuzz (Go port) <https://github.com/paul-mannino/go-fuzzywuzzy>`_
+
+
+

benchmarks.py

@@ -49,54 +49,54 @@ def print_result_from_timeit(stmt='pass', setup='pass', number=1000000):
     Clean function to know how much time took the execution of one statement
     """
     units = ["s", "ms", "us", "ns"]
-    duration = timeit(stmt, setup, number=number)
+    duration = timeit(stmt, setup, number=int(number))
     avg_duration = duration / float(number)
     thousands = int(math.floor(math.log(avg_duration, 1000)))
 
-    print "Total time: %fs. Average run: %.3f%s." \
-        % (duration, avg_duration * (1000 ** -thousands), units[-thousands])
+    print("Total time: %fs. Average run: %.3f%s." % (
+        duration, avg_duration * (1000 ** -thousands), units[-thousands]))
+
 
 for s in choices:
-    print 'Test validate_string for: "%s"' % s
+    print('Test validate_string for: "%s"' % s)
     print_result_from_timeit('utils.validate_string(\'%s\')' % s, common_setup, number=iterations)
 
-print
+print('')
 
 for s in mixed_strings + cirque_strings + choices:
-    print 'Test full_process for: "%s"' % s
+    print('Test full_process for: "%s"' % s)
     print_result_from_timeit('utils.full_process(u\'%s\')' % s,
                              common_setup + basic_setup, number=iterations)
 
 # benchmarking the core matching methods...
 
 for s in cirque_strings:
-    print 'Test fuzz.ratio for string: "%s"' % s
-    print '-------------------------------'
+    print('Test fuzz.ratio for string: "%s"' % s)
+    print('-------------------------------')
     print_result_from_timeit('fuzz.ratio(u\'cirque du soleil\', u\'%s\')' % s,
                              common_setup + basic_setup, number=iterations / 100)
 
 for s in cirque_strings:
-    print 'Test fuzz.partial_ratio for string: "%s"' % s
-    print '-------------------------------'
+    print('Test fuzz.partial_ratio for string: "%s"' % s)
+    print('-------------------------------')
     print_result_from_timeit('fuzz.partial_ratio(u\'cirque du soleil\', u\'%s\')'
                              % s, common_setup + basic_setup, number=iterations / 100)
 
 for s in cirque_strings:
-    print 'Test fuzz.WRatio for string: "%s"' % s
-    print '-------------------------------'
+    print('Test fuzz.WRatio for string: "%s"' % s)
+    print('-------------------------------')
     print_result_from_timeit('fuzz.WRatio(u\'cirque du soleil\', u\'%s\')' % s,
                              common_setup + basic_setup, number=iterations / 100)
-
 
-print 'Test process.exract(scorer =  fuzz.QRatio) for string: "%s"' % s
-print '-------------------------------'
+print('Test process.exract(scorer =  fuzz.QRatio) for string: "%s"' % s)
+print('-------------------------------')
 print_result_from_timeit('process.extract(u\'cirque du soleil\', choices, scorer =  fuzz.QRatio)',
                              common_setup + basic_setup + " from fuzzywuzzy import process; import string,random; random.seed(18);"
                              " choices = [\'\'.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(30)) for s in range(5000)]",
                               number=10)
 
-print 'Test process.exract(scorer =  fuzz.WRatio) for string: "%s"' % s
-print '-------------------------------'
+print('Test process.exract(scorer =  fuzz.WRatio) for string: "%s"' % s)
+print('-------------------------------')
 print_result_from_timeit('process.extract(u\'cirque du soleil\', choices, scorer =  fuzz.WRatio)',
                              common_setup + basic_setup + " from fuzzywuzzy import process; import string,random; random.seed(18);"
                              " choices = [\'\'.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(30)) for s in range(5000)]",
@@ -112,8 +112,8 @@ def print_result_from_timeit(stmt='pass', setup='pass', number=1000000):
 test += 'title_blob = title_blob.strip()\n'
 test += 'titles = title_blob.split("\\n")\n'
 
-print 'Real world ratio(): "%s"' % s
-print '-------------------------------'
+print('Real world ratio(): "%s"' % s)
+print('-------------------------------')
 test += 'prepared_ratio = functools.partial(fuzz.ratio, "%s")\n' % s
 test += 'titles.sort(key=prepared_ratio)\n'
 print_result_from_timeit(test,

fuzzywuzzy/fuzz.py

@@ -1,29 +1,5 @@
 #!/usr/bin/env python
 # encoding: utf-8
-"""
-fuzz.py
-
-Copyright (c) 2011 Adam Cohen
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
 from __future__ import unicode_literals
 import platform
 import warnings

fuzzywuzzy/process.py

@@ -1,30 +1,5 @@
 #!/usr/bin/env python
 # encoding: utf-8
-"""
-process.py
-
-Copyright (c) 2011 Adam Cohen
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
-
 from . import fuzz
 from . import utils
 import heapq