diff --git a/.gitignore b/.gitignore index 797ae63..09e4992 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /jellyfish-0.5.5.tar.gz /jellyfish-0.5.6.tar.gz /jellyfish-0.6.0.tar.gz +/jellyfish-0.7.2.tar.gz diff --git a/nocimplementation-fix-0.7.2.patch b/nocimplementation-fix-0.7.2.patch new file mode 100644 index 0000000..6ff7b98 --- /dev/null +++ b/nocimplementation-fix-0.7.2.patch @@ -0,0 +1,31 @@ +diff -up jellyfish-0.7.2/jellyfish/test.py.orig jellyfish-0.7.2/jellyfish/test.py +--- jellyfish-0.7.2/jellyfish/test.py.orig 2019-06-23 16:02:55.515012430 +0200 ++++ jellyfish-0.7.2/jellyfish/test.py 2019-06-23 16:03:11.707209154 +0200 +@@ -109,17 +109,17 @@ if platform.python_implementation() == ' + # this segfaulted on 0.1.2 + assert [[jf.match_rating_comparison(h1, h2) for h1 in sha1s] for h2 in sha1s] + +- def test_damerau_levenshtein_unicode_segfault(): +- # test that unicode works in C & Python versions now +- from jellyfish.cjellyfish import damerau_levenshtein_distance as c_dl +- from jellyfish._jellyfish import damerau_levenshtein_distance as py_dl +- s1 = u'mylifeoutdoors' +- s2 = u'нахлыст' +- assert c_dl(s1, s2) == 14 +- assert c_dl(s2, s1) == 14 ++ #def test_damerau_levenshtein_unicode_segfault(): ++ # # test that unicode works in C & Python versions now ++ # from jellyfish.cjellyfish import damerau_levenshtein_distance as c_dl ++ # from jellyfish._jellyfish import damerau_levenshtein_distance as py_dl ++ # s1 = u'mylifeoutdoors' ++ # s2 = u'нахлыст' ++ # assert c_dl(s1, s2) == 14 ++ # assert c_dl(s2, s1) == 14 + +- assert py_dl(s1, s2) == 14 +- assert py_dl(s2, s1) == 14 ++ # assert py_dl(s1, s2) == 14 ++ # assert py_dl(s2, s1) == 14 + + + def test_jaro_winkler_long_tolerance(jf): diff --git a/python-jellyfish.spec b/python-jellyfish.spec index 71bacf8..5c6fff8 100644 --- a/python-jellyfish.spec +++ b/python-jellyfish.spec @@ -3,8 +3,8 @@ %global _docdir_fmt %{name} Name: python-%{realname} -Version: 0.6.0 -Release: 5%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: A python library for doing approximate and phonetic matching of strings License: BSD @@ -19,7 +19,7 @@ Patch0: fix-build.patch # disable the tests that check for this C version Patch1: test-only-python-implementation.diff Patch2: mark-segfault-test-xfail.diff -Patch3: nocimplementation-fix-0.5.4.patch +Patch3: nocimplementation-fix-0.7.2.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -77,6 +77,9 @@ PYTHONPATH=. pytest-3 jellyfish/test.py %{python3_sitelib}/%{realname}*.egg-info %changelog +* Sun Jun 23 2019 Michele Baldessari - 0.7.2 +- New upstream + * Sat Feb 02 2019 Fedora Release Engineering - 0.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 9167bcf..fc37725 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (jellyfish-0.6.0.tar.gz) = 22b722b554b63179053141bcf11bc86bd8482def069cea3e3af8b28f5cf3ceedb5f0200b0c1cb183ebe55f78935d95c83aeba6df6f0b4cfe89473e5719a2941e -SHA512 (jellyfish-testdata-20160204.tgz) = b90f49f52698131c4cb0370397261be88fcbcc4de6ccf3aaeff243a913f8aab1b9f6cc669a90a6c9ef15044441b8d4f9317088ebc8ead0be06f2ea31205b2de3 +SHA512 (jellyfish-0.7.2.tar.gz) = a731f753ac90fdf0c7b7c32e0a8985e98685b4fec519f4c74544db78d39909a699eb03efc383d4525e8929dc36dc4dfdcb6eb339c63e5714d903bca40a458a9e