From c310a753ee55b7438cf8dbab7219a548a58c1a64 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 19 May 2021 09:55:40 +0300
Subject: [PATCH] =?UTF-8?q?python3Packages.geopandas:=200.8.1=20=E2=86=92?=
 =?UTF-8?q?=200.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../python-modules/geopandas/default.nix      | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 70963a85d41d0c..7bd45a2b46ee25 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,45 +1,33 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27
-, pandas, shapely, fiona, descartes, pyproj
-, pytestCheckHook, Rtree, fetchpatch }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+, pandas, shapely, fiona, pyproj
+, pytestCheckHook, Rtree }:
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "0.8.1";
-  disabled = isPy27;
+  version = "0.9.0";
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     rev = "v${version}";
-    sha256 = "0618p0s0biisxk2s0h43hkc3bs1nwjk84rxbfyd6brfvs9yx4vq7";
+    sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE=";
   };
 
-  patches = [
-    # Fix for test test_numerical_operations: https://github.com/geopandas/geopandas/issues/1541
-    (fetchpatch {
-      url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch";
-      sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq";
-    })
-    # Fix GeoJSON for Fiona>=1.8.16 (Sep. 7, 2020).
-    # https://github.com/geopandas/geopandas/issues/1606
-    # Will be included in next upstream release after 0.8.1
-    (fetchpatch {
-      url = "https://github.com/geopandas/geopandas/commit/72427d3d8c128039bfce1d54a76c0b652887b276.patch";
-      sha256 = "1726mrpddgmba0ngff73a5bsb6ywpsg63a2pdd2grp9339bgvi4a";
-    })
-  ];
-
   propagatedBuildInputs = [
     pandas
     shapely
     fiona
-    descartes
     pyproj
   ];
 
   doCheck = !stdenv.isDarwin;
   checkInputs = [ pytestCheckHook Rtree ];
-  disabledTests = [ "web" ];
+  disabledTests = [
+    # requires network access
+    "test_read_file_remote_geojson_url"
+    "test_read_file_remote_zipfile_url"
+  ];
   pytestFlagsArray = [ "geopandas" ];
 
   meta = with lib; {