Merge pull request #138479 from dotlambda/proj-8.1.1

proj: 7.2.1 -> 8.1.1

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

@@ -8,14 +8,21 @@
 
 buildPythonPackage rec {
   pname = "cartopy";
-  version = "0.19.0.post1";
+  version = "0.20.0";
 
   src = fetchPypi {
     inherit version;
     pname = "Cartopy";
-    sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb";
+    sha256 = "eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a";
   };
 
+  postPatch = ''
+    # https://github.com/SciTools/cartopy/issues/1880
+    substituteInPlace lib/cartopy/tests/test_crs.py \
+      --replace "test_osgb(" "dont_test_osgb(" \
+      --replace "test_epsg(" "dont_test_epsg("
+  '';
+
   buildInputs = [
     geos proj
   ];

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

@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder
 , pandas, shapely, fiona, pyproj
 , pytestCheckHook, Rtree }:
 
@@ -14,6 +14,19 @@ buildPythonPackage rec {
     sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "skip-pandas-master-fillna-test.patch";
+      url = "https://github.com/geopandas/geopandas/pull/1878.patch";
+      sha256 = "1yw3i4dbhaq7f02n329b9y2cqxbwlz9db81mhgrfc7af3whwysdb";
+    })
+    (fetchpatch {
+      name = "fix-proj4strings-test.patch";
+      url = "https://github.com/geopandas/geopandas/pull/1958.patch";
+      sha256 = "0kzmpq5ry87yvhqr6gnh9p2606b06d3ynzjvw0hpp9fncczpc2yn";
+    })
+  ];
+
   propagatedBuildInputs = [
     pandas
     shapely

pkgs/development/python-modules/pyproj/001.proj.patch

@@ -1,19 +1,21 @@
-diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py
---- a/pyproj/datadir.py	2021-04-10 18:26:52.829018483 +0100
-+++ b/pyproj/datadir.py	2021-04-10 18:44:59.155190614 +0100
-@@ -70,7 +70,7 @@
+diff --git a/pyproj/datadir.py b/pyproj/datadir.py
+index 9ca1d25..4198490 100644
+--- a/pyproj/datadir.py
++++ b/pyproj/datadir.py
+@@ -70,7 +70,7 @@ def get_data_dir() -> str:
+     global _VALIDATED_PROJ_DATA
      if _VALIDATED_PROJ_DATA is not None:
          return _VALIDATED_PROJ_DATA
-     global _USER_PROJ_DATA
 -    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
 +    internal_datadir = Path("@proj@/share/proj")
      proj_lib_dirs = os.environ.get("PROJ_LIB", "")
      prefix_datadir = Path(sys.prefix, "share", "proj")
  
-diff -Nur a/setup.py b/setup.py
---- a/setup.py	2021-04-10 18:26:52.817018512 +0100
-+++ b/setup.py	2021-04-10 18:46:01.652324424 +0100
-@@ -11,7 +11,7 @@
+diff --git a/setup.py b/setup.py
+index 6bb0c6c..b3d0321 100644
+--- a/setup.py
++++ b/setup.py
+@@ -12,7 +12,7 @@ from setuptools import Extension, setup
  PROJ_MIN_VERSION = parse_version("7.2.0")
  CURRENT_FILE_PATH = Path(__file__).absolute().parent
  BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
@@ -22,7 +24,7 @@ diff -Nur a/setup.py b/setup.py
  
  
  def get_proj_version(proj_dir: Path) -> str:
-@@ -150,7 +150,7 @@
+@@ -155,7 +155,7 @@ def get_extension_modules():
      # By default we'll try to get options PROJ_DIR or the local version of proj
      proj_dir = get_proj_dir()
      library_dirs = get_proj_libdirs(proj_dir)
@@ -31,21 +33,11 @@ diff -Nur a/setup.py b/setup.py
  
      proj_version = get_proj_version(proj_dir)
      check_proj_version(proj_version)
-diff -Nur a/test/conftest.py b/test/conftest.py
---- a/test/conftest.py	2021-04-10 18:26:52.831018478 +0100
-+++ b/test/conftest.py	2021-04-10 18:37:01.605682432 +0100
-@@ -2,6 +2,7 @@
- from contextlib import contextmanager
- from distutils.version import LooseVersion
- from pathlib import Path
-+import stat
- 
- import pyproj
- from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir
-diff -Nur a/test/test_cli.py b/test/test_cli.py
---- a/test/test_cli.py	2021-04-10 18:26:52.831018478 +0100
-+++ b/test/test_cli.py	2021-04-10 22:17:04.665088162 +0100
-@@ -14,7 +14,7 @@
+diff --git a/test/test_cli.py b/test/test_cli.py
+index 7a696de..1b9b777 100644
+--- a/test/test_cli.py
++++ b/test/test_cli.py
+@@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson
  from test.conftest import grids_available, proj_env, tmp_chdir
  
  PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(

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

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyproj";
-  version = "3.1.0";
+  version = "3.2.1";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pyproj4";
     repo = "pyproj";
     rev = version;
-    sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E=";
+    sha256 = "sha256-r343TvXpSr+EMAbvzSUpsfipwP8TFmitOfT0gjgoO00=";
   };
 
   # force pyproj to use ${proj}