From ceb01fb12d35130a10ef1d87ac0a8b74e784db47 Mon Sep 17 00:00:00 2001
From: lsix <lsix+github@lancelotsix.com>
Date: Wed, 5 May 2021 17:03:03 +0100
Subject: [PATCH] python3Packages.cartopy: 0.18.0 -> 0.19.0.post1 (#121782)

---
 .../python-modules/cartopy/default.nix        | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 87eafc265501..d3953137167a 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -1,29 +1,21 @@
-{ buildPythonPackage, lib, fetchPypi, fetchpatch
+{ buildPythonPackage, lib, fetchPypi
 , pytestCheckHook, filelock, mock, pep8
 , cython
 , six, pyshp, shapely, geos, numpy
 , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
-, proj
+, proj, flufl_lock
 }:
 
 buildPythonPackage rec {
   pname = "cartopy";
-  version = "0.18.0";
+  version = "0.19.0.post1";
 
   src = fetchPypi {
     inherit version;
     pname = "Cartopy";
-    sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz";
+    sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb";
   };
 
-  patches = [
-    # Fix numpy-1.20 compatibility.  Will be part of 0.19.
-    (fetchpatch {
-      url = "https://github.com/SciTools/cartopy/commit/e663bbbef07989a5f8484a8f36ea9c07e61d14ce.patch";
-      sha256 = "061kbjgzkc3apaz6sxy00pkgy3n9dxcgps5wzj4rglb5iy86n2kq";
-    })
-  ];
-
   buildInputs = [
     geos proj
   ];
@@ -36,7 +28,7 @@ buildPythonPackage rec {
     gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
   ];
 
-  checkInputs = [ pytestCheckHook filelock mock pep8 ];
+  checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ];
 
   pytestFlagsArray = [
     "--pyargs" "cartopy"
@@ -46,6 +38,7 @@ buildPythonPackage rec {
   disabledTests = [
     "test_nightshade_image"
     "background_img"
+    "test_gridliner_labels_bbox_style"
   ];
 
   nativeBuildInputs = [
@@ -56,7 +49,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Process geospatial data to create maps and perform analyses";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
     homepage = "https://scitools.org.uk/cartopy/docs/latest/";
     maintainers = with maintainers; [ mredaelli ];
   };