[Git][debian-gis-team/python-rtree][master] 2 commits: Revert "Fix autopkgtest failure."

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / python-rtree


Commits:
182ae479 by Bas Couwenberg at 2023-10-17T06:44:58+02:00
Revert "Fix autopkgtest failure."

This reverts commit 04e82523a797daf56cd1ea6994e5d3b4f2d18606.

- - - - -
8177d3b3 by Bas Couwenberg at 2023-10-17T06:52:01+02:00
Add patch to fix autopkgtest failure.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/finder.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,7 @@
 python-rtree (1.1.0-2) UNRELEASED; urgency=medium
 
   * Add patch to fix FTBFS on i386.
-  * Fix autopkgtest failure.
+  * Add patch to fix autopkgtest failure.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 17 Oct 2023 05:47:08 +0200
 


=====================================
debian/patches/finder.patch
=====================================
@@ -0,0 +1,31 @@
+Description: Fix test failure with built library.
+ TypeError: 'NoneType' object is not iterable.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/Toblerity/rtree/pull/291
+
+--- a/rtree/finder.py
++++ b/rtree/finder.py
+@@ -81,14 +81,15 @@ def load() -> ctypes.CDLL:
+             # add path for binary wheel prepared with cibuildwheel/auditwheel
+             try:
+                 pkg_files = importlib.metadata.files("rtree")
+-                for file in pkg_files:  # type: ignore
+-                    if (
+-                        file.parent.name == "Rtree.libs"
+-                        and file.stem.startswith("libspatialindex")
+-                        and ".so" in file.suffixes
+-                    ):
+-                        _candidates.insert(1, os.path.join(str(file.locate())))
+-                        break
++                if pkg_files is not None:
++                    for file in pkg_files:  # type: ignore
++                        if (
++                            file.parent.name == "Rtree.libs"
++                            and file.stem.startswith("libspatialindex")
++                            and ".so" in file.suffixes
++                        ):
++                            _candidates.insert(1, os.path.join(str(file.locate())))
++                            break
+             except importlib.metadata.PackageNotFoundError:
+                 pass
+ 


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 test_index.patch
+finder.patch


=====================================
debian/rules
=====================================
@@ -5,9 +5,6 @@
 #export DH_VERBOSE=1
 
 export PYBUILD_NAME=rtree
-ifeq ($(PYBUILD_AUTOPKGTEST),1)
-export PYBUILD_BEFORE_TEST=cp -rv tests/ {build_dir}
-endif
 
 %:
 	dh $@ --buildsystem=pybuild



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-rtree/-/compare/04e82523a797daf56cd1ea6994e5d3b4f2d18606...8177d3b3839f2fea72a67b648259f255ac5627a8

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-rtree/-/compare/04e82523a797daf56cd1ea6994e5d3b4f2d18606...8177d3b3839f2fea72a67b648259f255ac5627a8
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/pkg-grass-devel/attachments/20231017/bd8242b6/attachment-0001.htm>