Hello community, here is the log from the commit of package python-annoy for openSUSE:Factory checked in at 2019-05-15 12:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-annoy (Old) and /work/SRC/openSUSE:Factory/.python-annoy.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-annoy" Wed May 15 12:34:21 2019 rev:5 rq:702925 version:1.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-annoy/python-annoy.changes 2019-03-19 09:59:03.608086873 +0100 +++ /work/SRC/openSUSE:Factory/.python-annoy.new.5148/python-annoy.changes 2019-05-15 12:34:23.232535073 +0200 @@ -1,0 +2,10 @@ +Tue May 14 17:27:38 UTC 2019 - [email protected] + +- Update to 1.15.2 + * Fix #379 error handling in save() + * Fix compile issue in linux + * Fix popcount #366 + * rebased reproduceable.patch + * Some more misc + +------------------------------------------------------------------- Old: ---- annoy-1.15.1.tar.gz New: ---- annoy-1.15.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-annoy.spec ++++++ --- /var/tmp/diff_new_pack.2uoUjr/_old 2019-05-15 12:34:23.900533149 +0200 +++ /var/tmp/diff_new_pack.2uoUjr/_new 2019-05-15 12:34:23.904533138 +0200 @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-annoy -Version: 1.15.1 +Version: 1.15.2 Release: 0 Summary: Approximation of Nearest Neighbors License: Apache-2.0 Group: Development/Languages/Python -URL: https://github.com/spotify/annoy +Url: https://github.com/spotify/annoy Source: https://files.pythonhosted.org/packages/source/a/annoy/annoy-%{version}.tar.gz # PATCH-FIX-OPENSUSE boo#1100677 Patch0: reproducible.patch ++++++ annoy-1.15.1.tar.gz -> annoy-1.15.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/annoy-1.15.1/PKG-INFO new/annoy-1.15.2/PKG-INFO --- old/annoy-1.15.1/PKG-INFO 2019-02-22 17:11:43.000000000 +0100 +++ new/annoy-1.15.2/PKG-INFO 2019-04-17 03:52:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: annoy -Version: 1.15.1 +Version: 1.15.2 Summary: Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk. Home-page: https://github.com/spotify/annoy Author: Erik Bernhardsson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/annoy-1.15.1/annoy.egg-info/PKG-INFO new/annoy-1.15.2/annoy.egg-info/PKG-INFO --- old/annoy-1.15.1/annoy.egg-info/PKG-INFO 2019-02-22 17:11:43.000000000 +0100 +++ new/annoy-1.15.2/annoy.egg-info/PKG-INFO 2019-04-17 03:52:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: annoy -Version: 1.15.1 +Version: 1.15.2 Summary: Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk. Home-page: https://github.com/spotify/annoy Author: Erik Bernhardsson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/annoy-1.15.1/setup.cfg new/annoy-1.15.2/setup.cfg --- old/annoy-1.15.1/setup.cfg 2019-02-22 17:11:43.000000000 +0100 +++ new/annoy-1.15.2/setup.cfg 2019-04-17 03:52:00.000000000 +0200 @@ -5,5 +5,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/annoy-1.15.1/setup.py new/annoy-1.15.2/setup.py --- old/annoy-1.15.1/setup.py 2019-02-22 17:11:27.000000000 +0100 +++ new/annoy-1.15.2/setup.py 2019-04-17 03:51:46.000000000 +0200 @@ -57,7 +57,7 @@ extra_link_args += ['-stdlib=libc++', '-mmacosx-version-min=10.9'] setup(name='annoy', - version='1.15.1', + version='1.15.2', description='Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk.', packages=['annoy'], ext_modules=[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/annoy-1.15.1/src/annoylib.h new/annoy-1.15.2/src/annoylib.h --- old/annoy-1.15.1/src/annoylib.h 2019-02-21 17:39:33.000000000 +0100 +++ new/annoy-1.15.2/src/annoylib.h 2019-04-10 03:52:02.000000000 +0200 @@ -26,6 +26,7 @@ #include <sys/types.h> #include <fcntl.h> #include <stddef.h> + #if defined(_MSC_VER) && _MSC_VER == 1500 typedef unsigned char uint8_t; typedef signed __int32 int32_t; @@ -44,6 +45,7 @@ #include <sys/mman.h> #endif +#include <cerrno> #include <string.h> #include <math.h> #include <vector> @@ -67,11 +69,9 @@ #ifndef _MSC_VER #define popcount __builtin_popcountll -#elif _MSC_VER == 1500 +#else // See #293, #358 #define isnan(x) _isnan(x) #define popcount cole_popcount -#else -#define popcount __popcnt64 #endif #ifndef NO_MANUAL_VECTORIZATION @@ -880,8 +880,15 @@ if (f == NULL) return false; - fwrite(_nodes, _s, _n_nodes, f); - fclose(f); + if (fwrite(_nodes, _s, _n_nodes, f) != (size_t) _n_nodes) { + showUpdate("Unable to write %s\n", strerror(errno)); + return false; + } + + if (fclose(f) == EOF) { + showUpdate("Unable to close %s\n", strerror(errno)); + return false; + } unload(); return load(filename, prefault=false); @@ -924,15 +931,15 @@ return false; } off_t size = lseek(_fd, 0, SEEK_END); + int flags = MAP_SHARED; + if (prefault) { #ifdef MAP_POPULATE - const int populate = prefault ? MAP_POPULATE : 0; - _nodes = (Node*)mmap( - 0, size, PROT_READ, MAP_SHARED | populate, _fd, 0); + flags |= MAP_POPULATE; #else - _nodes = (Node*)mmap( - 0, size, PROT_READ, MAP_SHARED, _fd, 0); + showUpdate("prefault is set to true, but MAP_POPULATE is not defined on this platform"); #endif - + } + _nodes = (Node*)mmap(0, size, PROT_READ, flags, _fd, 0); _n_nodes = (S)(size / _s); // Find the roots by scanning the end of the file and taking the nodes with most descendants ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.2uoUjr/_old 2019-05-15 12:34:24.084532620 +0200 +++ /var/tmp/diff_new_pack.2uoUjr/_new 2019-05-15 12:34:24.084532620 +0200 @@ -3,10 +3,10 @@ https://bugzilla.opensuse.org/show_bug.cgi?id=1100677 -Index: annoy-1.15.1/setup.py +Index: annoy-1.15.2/setup.py =================================================================== ---- annoy-1.15.1.orig/setup.py -+++ annoy-1.15.1/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= long_description = readme_note + fobj.read() @@ -33,5 +33,5 @@ - extra_link_args += ['-stdlib=libc++', '-mmacosx-version-min=10.9'] - setup(name='annoy', - version='1.15.1', + version='1.15.2', description='Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk.',
