commit 11d29ac93d2aaad2db456ddc8ab02443c7d755ee · pyrox.dev/nixpkgs

+9 -10

pkgs/development/python-modules/pygeos/default.nix

···

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM=";

     

       17
       17
       +
           hash = "sha256-MPvBf2SEQgC4UTO4hfz7ZVQbh3lTH270+P5GfT+6diM=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         patches = [

     

       21
       21
       -
           # Adapt https://github.com/shapely/shapely/commit/4889bd2d72ff500e51ba70d5b954241878349562,

     

       22
       22
       -
           # backporting to pygeos

     

       23
       23
       -
           ./fix-for-geos-3-11.patch

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       20
        
         nativeBuildInputs = [

     

       27
       21
        
           geos # for geos-config

     

       28
       22
        
           cython

     

       29
       23
        
         ];

     

       30
       24
        
       

     

       31
       31
       -
         propagatedBuildInputs = [ numpy ];

     

       25
       25
       +
         propagatedBuildInputs = [

     

       26
       26
       +
           numpy

     

       27
       27
       +
         ];

     

       32
       28
        
       

     

       33
       29
        
         # The cythonized extensions are required to exist in the pygeos/ directory

     

       34
       30
        
         # for the package to function. Therefore override of buildPhase was

     
···

       42
       38
        
           pytestCheckHook

     

       43
       39
        
         ];

     

       44
       40
        
       

     

       45
       45
       -
         pythonImportsCheck = [ "pygeos" ];

     

       41
       41
       +
         pythonImportsCheck = [

     

       42
       42
       +
           "pygeos"

     

       43
       43
       +
         ];

     

       46
       44
        
       

     

       47
       45
        
         meta = with lib; {

     

       48
       48
       -
           description = "Wraps GEOS geometry functions in numpy ufuncs.";

     

       46
       46
       +
           description = "Wraps GEOS geometry functions in numpy ufuncs";

     

       49
       47
        
           homepage = "https://github.com/pygeos/pygeos";

     

       48
       48
       +
           changelog = "https://github.com/pygeos/pygeos/blob/${version}/CHANGELOG.rst";

     

       50
       49
        
           license = licenses.bsd3;

     

       51
       50
        
           maintainers = with maintainers; [ nialov ];

     

       52
       51
        
         };

-29

pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch

···

       1
       1
       -
       From ea82dbefeb573150935eb78a6916813775512e76 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Joris Van den Bossche <jorisvandenbossche@gmail.com>

     

       3
       3
       -
       Date: Tue, 26 Apr 2022 22:17:00 +0200

     

       4
       4
       -
       Subject: [PATCH] TST: fix tests for GEOS main (#1357) (backported for nixpkgs)

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        pygeos/tests/test_constructive.py | 6 +++++-

     

       8
       8
       -
        1 file changed, 5 insertions(+), 1 deletion(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/pygeos/tests/test_constructive.py b/pygeos/tests/test_constructive.py

     

       11
       11
       -
       index 87c0a9f..b3459d1 100644

     

       12
       12
       -
       --- a/pygeos/tests/test_constructive.py

     

       13
       13
       -
       +++ b/pygeos/tests/test_constructive.py

     

       14
       14
       -
       @@ -48,7 +48,11 @@ def test_no_args_array(geometry, func):

     

       15
       15
       -
        @pytest.mark.parametrize("geometry", all_types)

     

       16
       16
       -
        @pytest.mark.parametrize("func", CONSTRUCTIVE_FLOAT_ARG)

     

       17
       17
       -
        def test_float_arg_array(geometry, func):

     

       18
       18
       -
       -    if func is pygeos.offset_curve and pygeos.get_type_id(geometry) not in [1, 2]:

     

       19
       19
       -
       +    if (

     

       20
       20
       -
       +        func is pygeos.offset_curve

     

       21
       21
       -
       +        and pygeos.get_type_id(geometry) not in [1, 2]

     

       22
       22
       -
       +        and pygeos.geos_version < (3, 11, 0)

     

       23
       23
       -
       +    ):

     

       24
       24
       -
                with pytest.raises(GEOSException, match="only accept linestrings"):

     

       25
       25
       -
                    func([geometry, geometry], 0.0)

     

       26
       26
       -
                return

     

       27
       27
       -
       -- 

     

       28
       28
       -
       2.36.1

     

       29
       29
       -