python3Packages.pyproj: 2.6.0 -> 3.0.1

Noticable changes:

- Python >= 3.7 is required

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

@@ -1,62 +1,56 @@
 diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py
---- a/pyproj/datadir.py	2020-03-24 12:53:39.417440608 +0100
+--- a/pyproj/datadir.py	2021-04-10 18:26:52.829018483 +0100
-+++ b/pyproj/datadir.py	2020-03-24 12:56:19.870089479 +0100
++++ b/pyproj/datadir.py	2021-04-10 18:44:59.155190614 +0100
-@@ -66,9 +66,7 @@
+@@ -70,7 +70,7 @@
      if _VALIDATED_PROJ_DATA is not None:
          return _VALIDATED_PROJ_DATA
      global _USER_PROJ_DATA
--    internal_datadir = os.path.join(
+-    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
--        os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
++    internal_datadir = Path("@proj@/share/proj")
--    )
-+    internal_datadir = "@proj@/share/proj"
      proj_lib_dirs = os.environ.get("PROJ_LIB", "")
-     prefix_datadir = os.path.join(sys.prefix, "share", "proj")
+     prefix_datadir = Path(sys.prefix, "share", "proj")
  
 diff -Nur a/setup.py b/setup.py
---- a/setup.py	2020-03-24 12:53:39.415440624 +0100
+--- a/setup.py	2021-04-10 18:26:52.817018512 +0100
-+++ b/setup.py	2020-03-24 12:52:05.311232522 +0100
++++ b/setup.py	2021-04-10 18:46:01.652324424 +0100
 @@ -11,7 +11,7 @@
- PROJ_MIN_VERSION = parse_version("6.2.0")
+ PROJ_MIN_VERSION = parse_version("7.2.0")
- CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
+ CURRENT_FILE_PATH = Path(__file__).absolute().parent
- BASE_INTERNAL_PROJ_DIR = "proj_dir"
+ BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
--INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR)
+-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
-+INTERNAL_PROJ_DIR = "@proj@"
++INTERNAL_PROJ_DIR = Path("@proj@")
  
  
- def check_proj_version(proj_dir):
+ def get_proj_version(proj_dir: Path) -> str:
-@@ -146,7 +146,7 @@
+@@ -150,7 +150,7 @@
      # 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)
 -    include_dirs = get_proj_incdirs(proj_dir)
-+    include_dirs = get_proj_incdirs("@projdev@")
++    include_dirs = get_proj_incdirs(Path("@projdev@"))
  
-     # setup extension options
+     proj_version = get_proj_version(proj_dir)
-     ext_options = {
+     check_proj_version(proj_version)
 diff -Nur a/test/conftest.py b/test/conftest.py
---- a/test/conftest.py	2020-03-24 12:53:39.417440608 +0100
+--- a/test/conftest.py	2021-04-10 18:26:52.831018478 +0100
-+++ b/test/conftest.py	2020-03-24 23:16:47.373972786 +0100
++++ b/test/conftest.py	2021-04-10 18:37:01.605682432 +0100
-@@ -1,6 +1,7 @@
+@@ -2,6 +2,7 @@
- import os
+ from contextlib import contextmanager
- import shutil
+ from distutils.version import LooseVersion
- import tempfile
+ from pathlib import Path
 +import stat
  
- import pytest
+ 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 @@
+ from test.conftest import grids_available, proj_env, tmp_chdir
+ 
+ PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(
+-    "input_command", [["pyproj"], [sys.executable, "-m", "pyproj"]]
++    "input_command", [[sys.executable, "-m", "pyproj"]]
+ )
+ 
  
-@@ -17,6 +18,15 @@
-     with tempfile.TemporaryDirectory() as tmpdir:
-         tmp_data_dir = os.path.join(tmpdir, "proj")
-         shutil.copytree(data_dir, tmp_data_dir)
-+
-+        # Data copied from the nix store is readonly (causes cleanup problem).
-+        # Make it writable.
-+        for r, d, files in os.walk(tmp_data_dir):
-+            os.chmod(r, os.stat(r).st_mode | stat.S_IWUSR)
-+            for f in files:
-+                fpath = os.path.join(r, f)
-+                os.chmod(fpath, os.stat(fpath).st_mode | stat.S_IWUSR)
-+
-         try:
-             os.remove(os.path.join(str(tmp_data_dir), "ntv2_0.gsb"))
-         except OSError:

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

@@ -1,60 +1,94 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll
+{ lib
-, aenum
+, buildPythonPackage
+, fetchFromGitHub
+, python
+, proj
+, pythonOlder
+, substituteAll
 , cython
 , pytestCheckHook
 , mock
+, certifi
 , numpy
 , shapely
+, pandas
+, xarray
 }:
 
 buildPythonPackage rec {
   pname = "pyproj";
-  version = "2.6.0";
+  version = "3.0.1";
-  disabled = isPy27;
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pyproj4";
     repo = "pyproj";
-    rev = "v${version}rel";
+    rev = version;
-    sha256 = "0fyggkbr3kp8mlq4c0r8sl5ah58bdg2mj4kzql9p3qyrkcdlgixh";
+    sha256 = "1q1i1235cp3k32dpb11r7krx5rpqwszb89mrx85rflc1z5acaj58";
   };
 
-  # force pyproj to use ${pkgs.proj}
+  # force pyproj to use ${proj}
   patches = [
     (substituteAll {
       src = ./001.proj.patch;
-      proj = pkgs.proj;
+      proj = proj;
-      projdev = pkgs.proj.dev;
+      projdev = proj.dev;
     })
   ];
 
-  buildInputs = [ cython pkgs.proj ];
+  nativeBuildInputs = [ cython ];
+  buildInputs = [ proj ];
 
   propagatedBuildInputs = [
-    numpy shapely
+     certifi
-  ] ++ lib.optional (pythonOlder "3.6") aenum;
+  ];
 
-  checkInputs = [ pytestCheckHook mock ];
+  checkInputs = [
+    pytestCheckHook
+    mock
+    numpy
+    shapely
+    pandas
+    xarray
+  ];
 
-  # prevent importing local directory
+  preCheck = ''
-  preCheck = "cd test";
+    # We need to build extensions locally to run tests
-  pytestFlagsArray = [
+    ${python.interpreter} setup.py build_ext --inplace
-    "--ignore=test_doctest_wrapper.py"
+    cd test
-    "--ignore=test_datadir.py"
+  '';
+
+  disabledTestPaths = [
+    "test_doctest_wrapper.py"
+    "test_datadir.py"
   ];
 
   disabledTests = [
-    "alternative_grid_name"
+    # The following tests try to access network and end up with a URLError
-    "transform_wgs84_to_alaska"
+    "test__load_grid_geojson_old_file"
-    "transformer_group__unavailable"
+    "test_get_transform_grid_list"
-    "transform_group__missing_best"
+    "test_get_transform_grid_list__area_of_use"
-    "datum"
+    "test_get_transform_grid_list__bbox__antimeridian"
-    "repr"
+    "test_get_transform_grid_list__bbox__out_of_bounds"
+    "test_get_transform_grid_list__contains"
+    "test_get_transform_grid_list__file"
+    "test_get_transform_grid_list__source_id"
+    "test_sync__area_of_use__list"
+    "test_sync__bbox__list"
+    "test_sync__bbox__list__exclude_world_coverage"
+    "test_sync__download_grids"
+    "test_sync__file__list"
+    "test_sync__source_id__list"
+    "test_sync_download"
+    "test_sync_download__directory"
+    "test_sync_download__system_directory"
+    "test_transformer_group__download_grids"
   ];
 
   meta = {
     description = "Python interface to PROJ.4 library";
-    homepage = "https://github.com/jswhit/pyproj";
+    homepage = "https://github.com/pyproj4/pyproj";
     license = with lib.licenses; [ isc ];
+    maintainers = with lib.maintainers; [ lsix ];
   };
 }