Commit cad214f2 authored by Kirill Radzikhovskyy's avatar Kirill Radzikhovskyy Committed by Robert Schütz
Browse files

python3Packages.cartopy: 0.21.1 -> 0.22.0

parent 5bab0075

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

+8 −18
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


buildPythonPackage rec {

  pname = "cartopy";

  version = "0.21.1";

  version = "0.22.0";



  disabled = pythonOlder "3.8";
@@ -32,22 +32,9 @@ buildPythonPackage rec { 
  src = fetchPypi {

    inherit version;

    pname = "Cartopy";

    hash = "sha256-idVklxLIWCIxxuEYJaBMhfbwzulNu4nk2yPqvKHMJQo=";

    hash = "sha256-swD5ASCTHUPxHvh8Bk6h2s7BtZpJQKp26/gs8JVIu0k=";

  };



  patches = [

    # https://github.com/SciTools/cartopy/pull/2163

    (fetchpatch {

      url = "https://github.com/SciTools/cartopy/commit/7fb57e294914dbda0ebe8caaeac4deffe5e71639.patch";

      hash = "sha256-qc14q+v2IMC+1NQ+OqLjUfJA3Sr5txniqS7CTQ6c7LI=";

    })

    # https://github.com/SciTools/cartopy/pull/2130

    (fetchpatch {

      url = "https://github.com/SciTools/cartopy/commit/6b4572ba1a8a877f28e25dfe9559c14b7a565958.patch";

      hash = "sha256-0u6VJMrvoD9bRLHiQV4HQCKDyWEb9dDS2A3rjm6uqYw=";

    })

  ];



  nativeBuildInputs = [

    cython

    geos # for geos-config
@@ -56,7 +43,8 @@ buildPythonPackage rec { 
  ];



  buildInputs = [

    geos proj

    geos

    proj

  ];



  propagatedBuildInputs = [
@@ -83,8 +71,10 @@ buildPythonPackage rec { 
  '';



  pytestFlagsArray = [

    "--pyargs" "cartopy"

    "-m" "'not network and not natural_earth'"

    "--pyargs"

    "cartopy"

    "-m"

    "'not network and not natural_earth'"

  ];



  disabledTests = [