diff --git a/datrie-0.7.1.tar.gz b/datrie-0.7.1.tar.gz deleted file mode 100644 index a6bcc31..0000000 --- a/datrie-0.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a11371cc2dbbad71d6dfef57ced6e8b384bb377eeb847c63d58f8dc8e8b2023 -size 193464 diff --git a/datrie-0.8.tar.gz b/datrie-0.8.tar.gz new file mode 100644 index 0000000..16f1d7b --- /dev/null +++ b/datrie-0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdd5da6ba6a97e7cd96eef2e7441c8d2ef890d04ba42694a41c7dffa3aca680c +size 226077 diff --git a/merged_pr_60.patch b/merged_pr_60.patch deleted file mode 100644 index 45d5897..0000000 --- a/merged_pr_60.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9b24b4c02783cdb703ac3f6c6d7d881db93166e0 Mon Sep 17 00:00:00 2001 -From: Jon Dufresne -Date: Mon, 7 Jan 2019 06:50:37 -0800 -Subject: [PATCH] Remove deprecated 'average_size' argument from hypothesis - tests (#60) - -The argument is deprecated and has no effect. Fixes warning: - - tests/test_random.py::test_contains - .../hypothesis/internal/validation.py:157: HypothesisDeprecationWarning: You should remove the average_size argument, because it is deprecated and no longer has any effect. Please open an issue if the default distribution of examples does not work for you. - since="2018-03-10", ---- - tests/test_random.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_random.py b/tests/test_random.py -index 76ab13e..3d0a7b3 100644 ---- a/tests/test_random.py -+++ b/tests/test_random.py -@@ -13,7 +13,7 @@ - import hypothesis.strategies as st - from hypothesis import given - -- printable_strings = st.lists(st.text(string.printable), average_size=5.) -+ printable_strings = st.lists(st.text(string.printable)) - - @given(printable_strings) - def test_contains(words): diff --git a/python-datrie.changes b/python-datrie.changes index 5e82967..093400c 100644 --- a/python-datrie.changes +++ b/python-datrie.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jul 25 08:40:51 UTC 2019 - pgajdos@suse.com + +- version update to 0.8 + * Python 3.7 compatibility; extension is rebuilt with Cython 0.29.11. + * Trie.get function; + * Python 2.6 and 3.3 support is dropped; + * removed patch to libdatrie which is no longer required; + * testing and CI fixes. +- deleted patches + - merged_pr_60.patch (upstreamed) + - reproducible.patch (upstreamed) + ------------------------------------------------------------------- Mon Mar 25 07:24:43 UTC 2019 - John Vandenberg diff --git a/python-datrie.spec b/python-datrie.spec index 75606ca..e6020a1 100644 --- a/python-datrie.spec +++ b/python-datrie.spec @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-datrie -Version: 0.7.1 +Version: 0.8 Release: 0 Summary: Trie data structure for Python License: LGPL-2.1-or-later @@ -26,8 +26,6 @@ Group: Development/Languages/Python URL: https://github.com/kmike/datrie Source: https://files.pythonhosted.org/packages/source/d/datrie/datrie-%{version}.tar.gz Patch0: datrie-bigendian.patch -Patch1: reproducible.patch -Patch2: merged_pr_60.patch BuildRequires: %{python_module Cython >= 0.26.1} BuildRequires: %{python_module devel} BuildRequires: %{python_module hypothesis} @@ -44,14 +42,12 @@ A trie data structure for Python (2.x and 3.x). Uses libdatrie. %prep %setup -q -n datrie-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 + +%build pushd src cython datrie.pyx cython *.pxd popd - -%build %python_build %install diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 5349b02..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 561af3d93c5d7e0cb1e389797943dc3e229cfed7 -Author: Bernhard M. Wiedemann -Date: Fri Mar 9 11:09:08 2018 +0100 - - Sort input file list - - so that datrie builds in a reproducible way - in spite of indeterministic filesystem readdir order - and http://bugs.python.org/issue30461 - -diff --git a/setup.py b/setup.py -index c861f8a..54c7adb 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,7 @@ import os - from setuptools import setup, Extension - - LIBDATRIE_DIR = 'libdatrie' --LIBDATRIE_FILES = glob.glob(os.path.join(LIBDATRIE_DIR, "datrie", "*.c")) -+LIBDATRIE_FILES = sorted(glob.glob(os.path.join(LIBDATRIE_DIR, "datrie", "*.c"))) - - DESCRIPTION = __doc__ - LONG_DESCRIPTION = open('README.rst').read() + open('CHANGES.rst').read()