nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

python3Packages.pyproj: 3.1.0 -> 3.2.1

+19 -27
+17 -25
pkgs/development/python-modules/pyproj/001.proj.patch
··· 1 - diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py 2 - --- a/pyproj/datadir.py 2021-04-10 18:26:52.829018483 +0100 3 - +++ b/pyproj/datadir.py 2021-04-10 18:44:59.155190614 +0100 4 - @@ -70,7 +70,7 @@ 1 + diff --git a/pyproj/datadir.py b/pyproj/datadir.py 2 + index 9ca1d25..4198490 100644 3 + --- a/pyproj/datadir.py 4 + +++ b/pyproj/datadir.py 5 + @@ -70,7 +70,7 @@ def get_data_dir() -> str: 6 + global _VALIDATED_PROJ_DATA 5 7 if _VALIDATED_PROJ_DATA is not None: 6 8 return _VALIDATED_PROJ_DATA 7 - global _USER_PROJ_DATA 8 9 - internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj" 9 10 + internal_datadir = Path("@proj@/share/proj") 10 11 proj_lib_dirs = os.environ.get("PROJ_LIB", "") 11 12 prefix_datadir = Path(sys.prefix, "share", "proj") 12 13 13 - diff -Nur a/setup.py b/setup.py 14 - --- a/setup.py 2021-04-10 18:26:52.817018512 +0100 15 - +++ b/setup.py 2021-04-10 18:46:01.652324424 +0100 16 - @@ -11,7 +11,7 @@ 14 + diff --git a/setup.py b/setup.py 15 + index 6bb0c6c..b3d0321 100644 16 + --- a/setup.py 17 + +++ b/setup.py 18 + @@ -12,7 +12,7 @@ from setuptools import Extension, setup 17 19 PROJ_MIN_VERSION = parse_version("7.2.0") 18 20 CURRENT_FILE_PATH = Path(__file__).absolute().parent 19 21 BASE_INTERNAL_PROJ_DIR = Path("proj_dir") ··· 24 22 25 23 26 24 def get_proj_version(proj_dir: Path) -> str: 27 - @@ -150,7 +150,7 @@ 25 + @@ -155,7 +155,7 @@ def get_extension_modules(): 28 26 # By default we'll try to get options PROJ_DIR or the local version of proj 29 27 proj_dir = get_proj_dir() 30 28 library_dirs = get_proj_libdirs(proj_dir) ··· 33 31 34 32 proj_version = get_proj_version(proj_dir) 35 33 check_proj_version(proj_version) 36 - diff -Nur a/test/conftest.py b/test/conftest.py 37 - --- a/test/conftest.py 2021-04-10 18:26:52.831018478 +0100 38 - +++ b/test/conftest.py 2021-04-10 18:37:01.605682432 +0100 39 - @@ -2,6 +2,7 @@ 40 - from contextlib import contextmanager 41 - from distutils.version import LooseVersion 42 - from pathlib import Path 43 - +import stat 44 - 45 - import pyproj 46 - from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir 47 - diff -Nur a/test/test_cli.py b/test/test_cli.py 48 - --- a/test/test_cli.py 2021-04-10 18:26:52.831018478 +0100 49 - +++ b/test/test_cli.py 2021-04-10 22:17:04.665088162 +0100 50 - @@ -14,7 +14,7 @@ 34 + diff --git a/test/test_cli.py b/test/test_cli.py 35 + index 7a696de..1b9b777 100644 36 + --- a/test/test_cli.py 37 + +++ b/test/test_cli.py 38 + @@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson 51 39 from test.conftest import grids_available, proj_env, tmp_chdir 52 40 53 41 PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(
+2 -2
pkgs/development/python-modules/pyproj/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "pyproj"; 20 - version = "3.1.0"; 20 + version = "3.2.1"; 21 21 disabled = pythonOlder "3.7"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "pyproj4"; 25 25 repo = "pyproj"; 26 26 rev = version; 27 - sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E="; 27 + sha256 = "sha256-r343TvXpSr+EMAbvzSUpsfipwP8TFmitOfT0gjgoO00="; 28 28 }; 29 29 30 30 # force pyproj to use ${proj}