python310Packages.geopandas: 0.10.2 -> 0.11.0

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

@@ -1,51 +1,63 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder
-, pandas, shapely, fiona, pyproj
-, pytestCheckHook, Rtree }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, fiona
+, packaging
+, pandas
+, pyproj
+, pytestCheckHook
+, pythonOlder
+, Rtree
+, shapely
+}:
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "0.10.2";
-  disabled = pythonOlder "3.6";
+  version = "0.11.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     rev = "v${version}";
-    sha256 = "14azl3gppqn90k8h4hpjilsivj92k6p1jh7mdr6p4grbww1b7sdq";
+    hash = "sha256-w3F2Uqr/+DdG2Td5YmHdF/LII2y29rQkGK5ooMUcfRk=";
   };
 
-  patches = [
-    # Fixes a test, will be included in the next release after 0.10.2
-    (fetchpatch {
-      url = "https://github.com/geopandas/geopandas/pull/2219/commits/ac67515c9df745b672cca1669adf05eaf5cb0f3b.patch";
-      sha256 = "sha256-XcaoFhD6Rq0nfEpMbOJiAWPbaPDrMwFwoyppayq8NHc=";
-    })
-    # 5 commits from post 0.10.2 that fix the test suite compatibility with pandas >=1.4
-    (fetchpatch {
-      url = "https://github.com/geopandas/geopandas/pull/2289.patch";
-      sha256 = "sha256-BcZVdaO/DdpZoVGUWaw9etFvvgwizAgrkaBISEOhV4A=";
-    })
+  propagatedBuildInputs = [
+    fiona
+    packaging
+    pandas
+    pyproj
+    shapely
   ];
 
-  propagatedBuildInputs = [
-    pandas
-    shapely
-    fiona
-    pyproj
+  checkInputs = [
+    pytestCheckHook
+    Rtree
   ];
 
   doCheck = !stdenv.isDarwin;
+
   preCheck = ''
-    # Wants to write test files into $HOME.
-    export HOME="$TMPDIR"
+    export HOME=$(mktemp -d);
   '';
-  checkInputs = [ pytestCheckHook Rtree ];
+
   disabledTests = [
-    # requires network access
+    # Requires network access
     "test_read_file_remote_geojson_url"
     "test_read_file_remote_zipfile_url"
   ];
-  pytestFlagsArray = [ "geopandas" ];
+
+  pytestFlagsArray = [
+    "geopandas"
+  ];
+
+  pythonImportsCheck = [
+    "geopandas"
+  ];
 
   meta = with lib; {
     description = "Python geospatial data analysis framework";