python3Packages.pygeos: fix version 0.14 build

This commit is contained in:
nialov 2023-01-17 12:15:16 +02:00
parent 2d38b664b4
commit 49daadf023
No known key found for this signature in database
GPG Key ID: A0FE92FDF934FBBA
2 changed files with 0 additions and 35 deletions

View File

@ -17,12 +17,6 @@ buildPythonPackage rec {
sha256 = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM=";
};
patches = [
# Adapt https://github.com/shapely/shapely/commit/4889bd2d72ff500e51ba70d5b954241878349562,
# backporting to pygeos
./fix-for-geos-3-11.patch
];
nativeBuildInputs = [
geos # for geos-config
cython

View File

@ -1,29 +0,0 @@
From ea82dbefeb573150935eb78a6916813775512e76 Mon Sep 17 00:00:00 2001
From: Joris Van den Bossche <jorisvandenbossche@gmail.com>
Date: Tue, 26 Apr 2022 22:17:00 +0200
Subject: [PATCH] TST: fix tests for GEOS main (#1357) (backported for nixpkgs)
---
pygeos/tests/test_constructive.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pygeos/tests/test_constructive.py b/pygeos/tests/test_constructive.py
index 87c0a9f..b3459d1 100644
--- a/pygeos/tests/test_constructive.py
+++ b/pygeos/tests/test_constructive.py
@@ -48,7 +48,11 @@ def test_no_args_array(geometry, func):
@pytest.mark.parametrize("geometry", all_types)
@pytest.mark.parametrize("func", CONSTRUCTIVE_FLOAT_ARG)
def test_float_arg_array(geometry, func):
- if func is pygeos.offset_curve and pygeos.get_type_id(geometry) not in [1, 2]:
+ if (
+ func is pygeos.offset_curve
+ and pygeos.get_type_id(geometry) not in [1, 2]
+ and pygeos.geos_version < (3, 11, 0)
+ ):
with pytest.raises(GEOSException, match="only accept linestrings"):
func([geometry, geometry], 0.0)
return
--
2.36.1