swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 00:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

python310Packages.pyproj: 3.3.1 -> 3.4.0

Browse source
This commit is contained in:
Robert Schütz 2022-11-09 09:49:39 -08:00
parent 12455a5d74
commit ac986f055a
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/python-modules/pyproj/001.proj.patch
View file

@ -1,5 +1,5 @@
diff --git a/pyproj/datadir.py b/pyproj/datadir.py
index 9ca1d25..4198490 100644
index df625fee..a2beb06c 100644
--- a/pyproj/datadir.py
+++ b/pyproj/datadir.py
@@ -70,7 +70,7 @@ def get_data_dir() -> str:
@ -8,23 +8,23 @@ index 9ca1d25..4198490 100644
return _VALIDATED_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", "")
proj_lib_dirs = os.environ.get("PROJ_DATA", os.environ.get("PROJ_LIB", ""))
prefix_datadir = Path(sys.prefix, "share", "proj")
conda_windows_prefix_datadir = Path(sys.prefix, "Library", "share", "proj")
diff --git a/setup.py b/setup.py
index 6bb0c6c..b3d0321 100644
index 71fb52cd..7984a68a 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from setuptools import Extension, setup
PROJ_MIN_VERSION = parse_version("7.2.0")
@@ -13,7 +13,7 @@ from setuptools import Extension, setup
PROJ_MIN_VERSION = parse_version("8.2.0")
CURRENT_FILE_PATH = Path(__file__).absolute().parent
BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
+INTERNAL_PROJ_DIR = Path("@proj@")
PROJ_VERSION_SEARCH = re.compile(r".*Rel\.\s+(?P<version>\d+\.\d+\.\d+).*")
def get_proj_version(proj_dir: Path) -> str:
@@ -155,7 +155,7 @@ def get_extension_modules():
@@ -163,7 +163,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)
@ -34,7 +34,7 @@ index 6bb0c6c..b3d0321 100644
proj_version = get_proj_version(proj_dir)
check_proj_version(proj_version)
diff --git a/test/test_cli.py b/test/test_cli.py
index 7a696de..1b9b777 100644
index 7a696de7..1b9b777b 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -14,7 +14,7 @@ from pyproj.sync import _load_grid_geojson

20
pkgs/development/python-modules/pyproj/default.nix
View file

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "pyproj";
version = "3.3.1";
version = "3.4.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pyproj4";
repo = "pyproj";
rev = "refs/tags/${version}";
hash = "sha256-QmpwnOnMjV29Tq+M6FCotDytq6zlhsp0Zgzw3V7nhNQ=";
hash = "sha256-EXPeDNGr6eAAsLXCkV9mmkNDO1KScjZYgmBPzt+A1OU=";
};
# force pyproj to use ${proj}
@ -53,14 +53,13 @@ buildPythonPackage rec {
];
preCheck = ''
# We need to build extensions locally to run tests
${python.interpreter} setup.py build_ext --inplace
cd test
# import from $out
rm -r pyproj
'';
disabledTestPaths = [
"test_doctest_wrapper.py"
"test_datadir.py"
"test/test_doctest_wrapper.py"
"test/test_datadir.py"
];
disabledTests = [
@ -86,9 +85,10 @@ buildPythonPackage rec {
];
meta = {
description = "Python interface to PROJ.4 library";
description = "Python interface to PROJ library";
homepage = "https://github.com/pyproj4/pyproj";
license = with lib.licenses; [ isc ];
maintainers = with lib.maintainers; [ lsix ];
changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ lsix dotlambda ];
};
}