[med-svn] [Git][med-team/hnswlib][master] 11 commits: d/control: add prerequisite for pyproject backend.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Mon Aug 21 13:20:48 BST 2023
Étienne Mollier pushed to branch master at Debian Med / hnswlib
Commits:
1a7c8c7b by Étienne Mollier at 2023-08-21T11:30:17+02:00
d/control: add prerequisite for pyproject backend.
- - - - -
2d3e724f by Étienne Mollier at 2023-08-21T11:31:37+02:00
d/clean: remove tmp directory an egg information.
Closes: #1047848
- - - - -
039cb5d9 by Étienne Mollier at 2023-08-21T11:33:12+02:00
typo.patch: new: fix a typo caught by lintian.
- - - - -
74899ca3 by Étienne Mollier at 2023-08-21T11:38:41+02:00
d/control: bring cross buildability one step further.
This is done by splitting the build dependency python3-all-dev into
python3-all-dev:any and libpython3-dev so crossbuild dependencies are
satisfiable.
- - - - -
e94a7173 by Étienne Mollier at 2023-08-21T12:11:46+02:00
cassert.patch: remove: fixed upstream.
- - - - -
7224c0b9 by Étienne Mollier at 2023-08-21T12:13:25+02:00
d/rules: remove top_level.txt from .dist-info.
This file is egg-info specific and flagged by lintian as documentation
outside /usr/share/doc.
- - - - -
8eea2707 by Étienne Mollier at 2023-08-21T12:16:06+02:00
noTwine.patch: mark forwarding not-needed.
- - - - -
6792be08 by Étienne Mollier at 2023-08-21T12:16:22+02:00
do-not-use-native-flags.patch: mark forwarding not-needed.
- - - - -
c072a5a2 by Étienne Mollier at 2023-08-21T14:18:44+02:00
use-shared-while-linking.patch: forwarding not-needed.
- - - - -
d539b0b7 by Étienne Mollier at 2023-08-21T14:19:00+02:00
typo.patch: forwarded upstream.
Gbp-Dch: ignore
- - - - -
4122955b by Étienne Mollier at 2023-08-21T14:20:09+02:00
ready to upload to unstable.
- - - - -
10 changed files:
- debian/changelog
- + debian/clean
- debian/control
- − debian/patches/cassert.patch
- debian/patches/do-not-use-native-flags.patch
- debian/patches/noTwine.patch
- debian/patches/series
- + debian/patches/typo.patch
- debian/patches/use-shared-while-linking.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+hnswlib (0.7.0-2) unstable; urgency=medium
+
+ * d/control: add prerequisite for pyproject backend.
+ * d/clean: remove tmp directory and egg information. (Closes: #1047848)
+ * typo.patch: new: fix a typo caught by lintian.
+ * d/control: bring cross buildability one step further.
+ This is done by splitting the build dependency python3-all-dev into
+ python3-all-dev:any and libpython3-dev so crossbuild dependencies are
+ satisfiable.
+ * cassert.patch: remove: fixed upstream.
+ * d/rules: remove top_level.txt from .dist-info.
+ This file is egg-info specific and flagged by lintian as documentation
+ outside /usr/share/doc.
+ * noTwine.patch: mark forwarding not-needed.
+ * do-not-use-native-flags.patch: mark forwarding not-needed.
+ * use-shared-while-linking.patch: mark forwarding not-needed.
+
+ -- Étienne Mollier <emollier at debian.org> Mon, 21 Aug 2023 14:19:23 +0200
+
hnswlib (0.7.0-1) unstable; urgency=medium
[ Andreas Tille ]
=====================================
debian/clean
=====================================
@@ -0,0 +1,2 @@
+python_bindings/hnswlib.egg-info/
+python_bindings/tmp/
=====================================
debian/control
=====================================
@@ -6,7 +6,9 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
Étienne Mollier <emollier at debian.org>
Build-Depends: debhelper-compat (= 13),
dh-python,
- python3-all-dev,
+ libpython3-dev,
+ pybuild-plugin-pyproject,
+ python3-all-dev:any,
python3-setuptools,
python3-pybind11,
python3-numpy
=====================================
debian/patches/cassert.patch deleted
=====================================
@@ -1,13 +0,0 @@
-Author: Steffen Möller
-Last-Update: 2020-09-06 14:39:12 +0200
-Description: Add missing "#include <cassert>"
-
---- a/hnswlib/hnswalg.h
-+++ b/hnswlib/hnswalg.h
-@@ -1,5 +1,6 @@
- #pragma once
-
-+#include <cassert>
- #include "visited_list_pool.h"
- #include "hnswlib.h"
- #include <atomic>
=====================================
debian/patches/do-not-use-native-flags.patch
=====================================
@@ -1,7 +1,7 @@
Description: Disable -march=native which is a baseline violation
Author: Nilesh Patra <npatra974 at gmail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974043
-Forwarded: no
+Forwarded: not-needed
Last-Update: 2020-11-11
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
=====================================
debian/patches/noTwine.patch
=====================================
@@ -1,6 +1,7 @@
Author: Steffen Möller
Last-Update: 2020-09-06 14:39:12 +0200
Description: Prevent execution of upstream Makefile in python_bindings dir
+Forwarded: not-needed
--- a/Makefile
+++ b/Makefile
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,5 @@
-cassert.patch
noTwine.patch
use-shared-while-linking.patch
do-not-use-native-flags.patch
cve-2023-37365.patch
+typo.patch
=====================================
debian/patches/typo.patch
=====================================
@@ -0,0 +1,26 @@
+Description: fix a typo caught by lintian.
+Author: Étienne Mollier <emollier at debian.org>
+Forwarded: https://github.com/nmslib/hnswlib/pull/500
+Last-Update: 2023-08-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- hnswlib.orig/python_bindings/bindings.cpp
++++ hnswlib/python_bindings/bindings.cpp
+@@ -633,7 +633,7 @@
+ (void*)items.data(row), k, p_idFilter);
+ if (result.size() != k)
+ throw std::runtime_error(
+- "Cannot return the results in a contigious 2D array. Probably ef or M is too small");
++ "Cannot return the results in a contiguous 2D array. Probably ef or M is too small");
+ for (int i = k - 1; i >= 0; i--) {
+ auto& result_tuple = result.top();
+ data_numpy_d[row * k + i] = result_tuple.first;
+@@ -653,7 +653,7 @@
+ (void*)(norm_array.data() + start_idx), k, p_idFilter);
+ if (result.size() != k)
+ throw std::runtime_error(
+- "Cannot return the results in a contigious 2D array. Probably ef or M is too small");
++ "Cannot return the results in a contiguous 2D array. Probably ef or M is too small");
+ for (int i = k - 1; i >= 0; i--) {
+ auto& result_tuple = result.top();
+ data_numpy_d[row * k + i] = result_tuple.first;
=====================================
debian/patches/use-shared-while-linking.patch
=====================================
@@ -1,5 +1,6 @@
Author: Nilesh Patra <npatra974 at gmail.com>
Description: Enable "-shared" while linking
+Forwarded: not-needed
Last-Changed: September 7, 2020
--- a/setup.py
+++ b/setup.py
=====================================
debian/rules
=====================================
@@ -4,6 +4,7 @@ DH_VERBOSE := 1
export LC_ALL=C.UTF-8
PYBUILD_NAME=hnswlib
PYBUILD_SYSTEM=pybuild
+DTMP=$(CURDIR)/debian/tmp
# avoid -march=native to respect baseline
export HNSWLIB_NO_NATIVE=yes
@@ -20,3 +21,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
echo "I: Testing goes here."; \
fi
endif
+
+execute_after_dh_auto_install:
+ rm -vf $(DTMP)/usr/lib/python*/dist-packages/*.dist-info/top_level.txt
View it on GitLab: https://salsa.debian.org/med-team/hnswlib/-/compare/11c5efd02d319ef3c76141433c268b09f4884859...4122955b6f1e4468734e75da9edd5b9376035348
--
View it on GitLab: https://salsa.debian.org/med-team/hnswlib/-/compare/11c5efd02d319ef3c76141433c268b09f4884859...4122955b6f1e4468734e75da9edd5b9376035348
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230821/e9692b14/attachment-0001.htm>
More information about the debian-med-commit
mailing list