Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at 19.09 47 lines 1.6 kB view raw
1diff a/pyproj/datadir.py b/pyproj/datadir.py 2--- a/pyproj/datadir.py 3+++ b/pyproj/datadir.py 4@@ -52,6 +52,7 @@ def get_data_dir(): 5 str: The valid data directory. 6 7 """ 8+ return "@proj@/share/proj" 9 # to avoid re-validating 10 global _VALIDATED_PROJ_DATA 11 if _VALIDATED_PROJ_DATA is not None: 12diff a/setup.py b/setup.py 13--- a/setup.py 14+++ b/setup.py 15@@ -16,7 +16,7 @@ INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ 16 17 def check_proj_version(proj_dir): 18 """checks that the PROJ library meets the minimum version""" 19- proj = os.path.join(proj_dir, "bin", "proj") 20+ proj = "@proj@/bin/proj" 21 proj_ver_bytes = subprocess.check_output(proj, stderr=subprocess.STDOUT) 22 proj_ver_bytes = (proj_ver_bytes.decode("ascii").split()[1]).strip(",") 23 proj_version = parse_version(proj_ver_bytes) 24@@ -33,6 +33,7 @@ def get_proj_dir(): 25 """ 26 This function finds the base PROJ directory. 27 """ 28+ return "@proj@" 29 proj_dir = os.environ.get("PROJ_DIR") 30 if proj_dir is None and os.path.exists(INTERNAL_PROJ_DIR): 31 proj_dir = INTERNAL_PROJ_DIR 32@@ -56,6 +57,7 @@ def get_proj_libdirs(proj_dir): 33 """ 34 This function finds the library directories 35 """ 36+ return ["@proj@/lib"] 37 proj_libdir = os.environ.get("PROJ_LIBDIR") 38 libdirs = [] 39 if proj_libdir is None: 40@@ -77,6 +79,7 @@ def get_proj_incdirs(proj_dir): 41 """ 42 This function finds the include directories 43 """ 44+ return ["@proj@/include"] 45 proj_incdir = os.environ.get("PROJ_INCDIR") 46 incdirs = [] 47 if proj_incdir is None: