Accepting request 688135 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/688135
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-datrie?expand=0&rev=6

merged_pr_60.patch

@@ -0,0 +1,28 @@
+From 9b24b4c02783cdb703ac3f6c6d7d881db93166e0 Mon Sep 17 00:00:00 2001
+From: Jon Dufresne <jon.dufresne@gmail.com>
+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):

python-datrie.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Mar 25 07:24:43 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
+
+- Add merged_pr_60.patch to build with recent hypothesis
+
+-------------------------------------------------------------------
+Fri Mar 22 14:18:03 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Regenerate all the cython files
+- Run fdupes
+
 -------------------------------------------------------------------
 Mon Mar  4 09:56:56 UTC 2019 - John Vandenberg <jayvdb@gmail.com>
 

python-datrie.spec

@@ -23,19 +23,19 @@ Release:        0
 Summary:        Trie data structure for Python
 License:        LGPL-2.1-or-later
 Group:          Development/Languages/Python
-Url:            https://github.com/kmike/datrie
+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}
 BuildRequires:  %{python_module pytest-runner}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %python_subpackages
 
 %description
@@ -45,8 +45,10 @@ A trie data structure for Python (2.x and 3.x). Uses libdatrie.
 %setup -q -n datrie-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 pushd src
 cython datrie.pyx
+cython *.pxd
 popd
 
 %build
@@ -54,6 +56,7 @@ popd
 
 %install
 %python_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
 %python_exec setup.py test