diff --git a/annoy-1.15.2.tar.gz b/annoy-1.15.2.tar.gz deleted file mode 100644 index 1aad2bb..0000000 --- a/annoy-1.15.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75647dca4b56a48fc5de23c8f271d2087b94458ecc720757f637345e919babc4 -size 636101 diff --git a/python-annoy.changes b/python-annoy.changes index 022b53a..e22beb3 100644 --- a/python-annoy.changes +++ b/python-annoy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 13 12:57:37 UTC 2019 - Tomáš Chvátal + +- Update to 1.16.0: + * Various warning fixes + * Cleanups +- Rebase patch reproducible.patch + ------------------------------------------------------------------- Tue May 14 17:27:38 UTC 2019 - svasudevan@suse.com diff --git a/python-annoy.spec b/python-annoy.spec index 49de4ac..b164795 100644 --- a/python-annoy.spec +++ b/python-annoy.spec @@ -12,23 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-annoy -Version: 1.15.2 +Version: 1.16.0 Release: 0 Summary: Approximation of Nearest Neighbors License: Apache-2.0 Group: Development/Languages/Python Url: https://github.com/spotify/annoy -Source: https://files.pythonhosted.org/packages/source/a/annoy/annoy-%{version}.tar.gz +Source: https://github.com/spotify/annoy/archive/v%{version}.tar.gz # PATCH-FIX-OPENSUSE boo#1100677 Patch0: reproducible.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module h5py} BuildRequires: %{python_module nose >= 1.0} +BuildRequires: %{python_module numpy} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: c++_compiler BuildRequires: fdupes @@ -45,6 +48,8 @@ share the same data. %prep %setup -q -n annoy-%{version} %patch0 -p1 +# fix testdata location +sed -i -e "s:'test/test:'test:g" test/index_test.py %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -54,6 +59,11 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} +%check +# online tests: test_fashion_mnist, test_glove_25, test_nytimes_16 +cd test +%pytest_arch -k 'not (test_fashion_mnist or test_glove_25 or test_nytimes_16)' + %files %{python_files} %doc README.rst %license LICENSE diff --git a/reproducible.patch b/reproducible.patch index 6ef3542..b52a6af 100644 --- a/reproducible.patch +++ b/reproducible.patch @@ -3,11 +3,11 @@ Date: 2018-07-10 https://bugzilla.opensuse.org/show_bug.cgi?id=1100677 -Index: annoy-1.15.2/setup.py +Index: annoy-1.16.0/setup.py =================================================================== ---- annoy-1.15.2.orig/setup.py -+++ annoy-1.15.2/setup.py -@@ -36,26 +36,10 @@ with codecs.open('README.rst', encoding= +--- annoy-1.16.0.orig/setup.py ++++ annoy-1.16.0/setup.py +@@ -36,29 +36,10 @@ with codecs.open('README.rst', encoding= long_description = readme_note + fobj.read() # Various platform-dependent extras @@ -24,6 +24,9 @@ Index: annoy-1.15.2/setup.py -if platform.machine() == 'ppc64le': - extra_compile_args += ['-mcpu=native',] - +-if platform.machine() == 'x86_64': +- extra_compile_args += cputune +- -if os.name != 'nt': - extra_compile_args += ['-O3', '-ffast-math', '-fno-associative-math'] - @@ -33,5 +36,5 @@ Index: annoy-1.15.2/setup.py - extra_link_args += ['-stdlib=libc++', '-mmacosx-version-min=10.9'] - setup(name='annoy', - version='1.15.2', + version='1.16.0', description='Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk.', diff --git a/v1.16.0.tar.gz b/v1.16.0.tar.gz new file mode 100644 index 0000000..b7888a4 --- /dev/null +++ b/v1.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3364fc1c3ff870ffeb6634af5092df40f17ca399160178529869f792ab231b7 +size 670002