tjh.dev
1diff -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 @@
5 if _VALIDATED_PROJ_DATA is not None:
6 return _VALIDATED_PROJ_DATA
7 global _USER_PROJ_DATA
8- internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
9+ internal_datadir = Path("@proj@/share/proj")
10 proj_lib_dirs = os.environ.get("PROJ_LIB", "")
11 prefix_datadir = Path(sys.prefix, "share", "proj")
12
13diff -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 @@
17 PROJ_MIN_VERSION = parse_version("7.2.0")
18 CURRENT_FILE_PATH = Path(__file__).absolute().parent
19 BASE_INTERNAL_PROJ_DIR = Path("proj_dir")
20-INTERNAL_PROJ_DIR = CURRENT_FILE_PATH / "pyproj" / BASE_INTERNAL_PROJ_DIR
21+INTERNAL_PROJ_DIR = Path("@proj@")
22
23
24 def get_proj_version(proj_dir: Path) -> str:
25@@ -150,7 +150,7 @@
26 # By default we'll try to get options PROJ_DIR or the local version of proj
27 proj_dir = get_proj_dir()
28 library_dirs = get_proj_libdirs(proj_dir)
29- include_dirs = get_proj_incdirs(proj_dir)
30+ include_dirs = get_proj_incdirs(Path("@projdev@"))
31
32 proj_version = get_proj_version(proj_dir)
33 check_proj_version(proj_version)
34diff -Nur a/test/conftest.py b/test/conftest.py
35--- a/test/conftest.py 2021-04-10 18:26:52.831018478 +0100
36+++ b/test/conftest.py 2021-04-10 18:37:01.605682432 +0100
37@@ -2,6 +2,7 @@
38 from contextlib import contextmanager
39 from distutils.version import LooseVersion
40 from pathlib import Path
41+import stat
42
43 import pyproj
44 from pyproj.datadir import get_data_dir, get_user_data_dir, set_data_dir
45diff -Nur a/test/test_cli.py b/test/test_cli.py
46--- a/test/test_cli.py 2021-04-10 18:26:52.831018478 +0100
47+++ b/test/test_cli.py 2021-04-10 22:17:04.665088162 +0100
48@@ -14,7 +14,7 @@
49 from test.conftest import grids_available, proj_env, tmp_chdir
50
51 PYPROJ_CLI_ENDPONTS = pytest.mark.parametrize(
52- "input_command", [["pyproj"], [sys.executable, "-m", "pyproj"]]
53+ "input_command", [[sys.executable, "-m", "pyproj"]]
54 )
55
56