[Git][debian-gis-team/python-rtree][master] Mark patches as Applied-Upstream.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Wed Oct 18 04:12:15 BST 2023



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


Commits:
e9343206 by Bas Couwenberg at 2023-10-18T05:11:56+02:00
Mark patches as Applied-Upstream.

- - - - -


2 changed files:

- debian/patches/finder.patch
- debian/patches/test_index.patch


Changes:

=====================================
debian/patches/finder.patch
=====================================
@@ -2,6 +2,7 @@ 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
+Applied-Upstream: https://github.com/Toblerity/rtree/commit/19ee0ac4c2b552f6358f33a86970c079f8293df5
 
 --- a/rtree/finder.py
 +++ b/rtree/finder.py


=====================================
debian/patches/test_index.patch
=====================================
@@ -1,6 +1,7 @@
 Description: Skip test failing on i386.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/Toblerity/rtree/pull/290
+Applied-Upstream: https://github.com/Toblerity/rtree/commit/7f3ea6c55621178b2296e1fa89efe90666aa4fac
 
 --- a/tests/test_index.py
 +++ b/tests/test_index.py
@@ -12,14 +13,11 @@ Forwarded: https://github.com/Toblerity/rtree/pull/290
  import tempfile
  import unittest
  from typing import Iterator
-@@ -451,6 +452,10 @@ class IndexSerialization(unittest.TestCa
+@@ -451,6 +452,7 @@ class IndexSerialization(unittest.TestCa
          self.assertTrue(len(hits), 10)
          self.assertEqual(hits, [0, 4, 16, 27, 35, 40, 47, 50, 76, 80])
  
-+    @pytest.mark.skipif(
-+        not sys.maxsize > 2**32,
-+        reason="Fails on 32bit systems",
-+    )
++    @pytest.mark.skipif(not sys.maxsize > 2**32, reason="Fails on 32bit systems")
      def test_interleaving(self) -> None:
          """Streaming against a persisted index without interleaving"""
  



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-rtree/-/commit/e9343206dfe9703b44b0f1d5a847fff697bdbfe4

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-rtree/-/commit/e9343206dfe9703b44b0f1d5a847fff697bdbfe4
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/20231018/0136f61e/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list