Antonio Valentino pushed to branch master at Debian GIS Project / pygeofilter
Commits:
40d26d43 by Antonio Valentino at 2024-08-08T07:59:08+00:00
New 0001-Fix-compatibility-with-i386.patch
- - - - -
abb33ea6 by Antonio Valentino at 2024-08-08T08:04:02+00:00
Skip test_temporal_json
- - - - -
3 changed files:
- + debian/patches/0001-Fix-compatibility-with-i386.patch
- + debian/patches/series
- debian/rules
Changes:
=====================================
debian/patches/0001-Fix-compatibility-with-i386.patch
=====================================
@@ -0,0 +1,44 @@
+From: Antonio Valentino <antonio.valent...@tiscali.it>
+Date: Thu, 8 Aug 2024 07:37:13 +0000
+Subject: Fix compatibility with i386
+
+Forwarded: not-needed
+---
+ tests/backends/sqlalchemy/test_evaluate.py | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/tests/backends/sqlalchemy/test_evaluate.py
b/tests/backends/sqlalchemy/test_evaluate.py
+index b3c955a..0e78bb9 100644
+--- a/tests/backends/sqlalchemy/test_evaluate.py
++++ b/tests/backends/sqlalchemy/test_evaluate.py
+@@ -22,6 +22,18 @@ from pygeofilter.parsers.ecql import parse
+
+ Base = declarative_base()
+
++mod_spatialite = ctypes.util.find_library("mod_spatialite")
++if not mod_spatialite:
++ import pathlib
++ matches = list(pathlib.Path("/usr/lib").glob("*/mod_spatialite.so"))
++ if matches:
++ mod_spatialite = str(matches[0])
++
++import pytest
++pytestmark = pytest.mark.skipif(
++ not mod_spatialite, reason="mod_spatialite.so not available"
++)
++
+
+ class Record(Base):
+ __tablename__ = "record"
+@@ -70,10 +82,7 @@ FIELD_MAPPING = {
+
+ def load_spatialite(dbapi_conn, connection_record):
+ dbapi_conn.enable_load_extension(True)
+- dbapi_conn.load_extension(
+- ctypes.util.find_library("mod_spatialite")
+- or "/usr/lib/x86_64-linux-gnu/mod_spatialite.so"
+- )
++ dbapi_conn.load_extension(mod_spatialite)
+
+
+ @pytest.fixture(scope="session")
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Fix-compatibility-with-i386.patch
=====================================
debian/rules
=====================================
@@ -14,7 +14,8 @@ and not test_touches_attr_multilinestring \
and not test_crosses_attr_multilinestring \
and not test_overlaps_attr_multilinestring \
and not test_relate_attr_polygon \
-and not test_function_no_arg" \
+and not test_function_no_arg \
+and not test_temporal_json" \
--ignore {dir}/tests/backends/elasticsearch/test_evaluate.py \
--ignore {dir}/tests/backends/elasticsearch/test_util.py \
-v {dir}/tests
View it on GitLab:
https://salsa.debian.org/debian-gis-team/pygeofilter/-/compare/ef8ae71845074b5b0123f0f4606c8530eaa5d891...abb33ea670b367ca49b113dbbefac6481d832f75
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/pygeofilter/-/compare/ef8ae71845074b5b0123f0f4606c8530eaa5d891...abb33ea670b367ca49b113dbbefac6481d832f75
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
