From fdef541582b4b84f01f319cf237fcbba4218f92e Mon Sep 17 00:00:00 2001 From: krishnadubey1008 Date: Sat, 5 Apr 2025 10:24:56 +0000 Subject: [PATCH 1/3] Provided a default value for SAGE_ROOT that can be overridden by an environment variable or configuration file --- src/sage/env.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sage/env.py b/src/sage/env.py index 310f24f3301..73663fbfbae 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -192,7 +192,8 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed")) # deprecated # source tree of the Sage distribution -SAGE_ROOT = var("SAGE_ROOT") # no fallback for SAGE_ROOT +DEFAULT_SAGE_ROOT = "" +SAGE_ROOT = var("SAGE_ROOT", DEFAULT_SAGE_ROOT) # no fallback for SAGE_ROOT SAGE_SRC = var("SAGE_SRC", join(SAGE_ROOT, "src"), SAGE_LIB) SAGE_DOC_SRC = var("SAGE_DOC_SRC", join(SAGE_ROOT, "src", "doc"), SAGE_DOC) SAGE_PKGS = var("SAGE_PKGS", join(SAGE_ROOT, "build", "pkgs")) From b50bd0cf6f39cd06eb56e9076d875b9028a6f0d2 Mon Sep 17 00:00:00 2001 From: krishnadubey1008 Date: Mon, 7 Apr 2025 13:51:22 +0000 Subject: [PATCH 2/3] fixed meson.build and env.py --- src/sage/env.py | 3 +-- src/sage/meson.build | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/sage/env.py b/src/sage/env.py index 73663fbfbae..0be48cd08a6 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -192,8 +192,7 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed")) # deprecated # source tree of the Sage distribution -DEFAULT_SAGE_ROOT = "" -SAGE_ROOT = var("SAGE_ROOT", DEFAULT_SAGE_ROOT) # no fallback for SAGE_ROOT +SAGE_ROOT = var("SAGE_ROOT", "") # no fallback for SAGE_ROOT SAGE_SRC = var("SAGE_SRC", join(SAGE_ROOT, "src"), SAGE_LIB) SAGE_DOC_SRC = var("SAGE_DOC_SRC", join(SAGE_ROOT, "src", "doc"), SAGE_DOC) SAGE_PKGS = var("SAGE_PKGS", join(SAGE_ROOT, "build", "pkgs")) diff --git a/src/sage/meson.build b/src/sage/meson.build index c90df69663f..bb0297b8542 100644 --- a/src/sage/meson.build +++ b/src/sage/meson.build @@ -4,7 +4,6 @@ sage_install_dir = py.get_install_dir() / 'sage' # Generate the configuration file conf_data = configuration_data() conf_data.set('PACKAGE_VERSION', '1.2.3') -conf_data.set('SAGE_ROOT', meson.current_source_dir() / '..' / '..') # We use Python's prefix here to make it work with conda prefix = fs.as_posix(py.get_variable('prefix', '')) conf_data.set('prefix', prefix) From cbd008e7a6a8d4481e0b6546e1cfab1b930eafc6 Mon Sep 17 00:00:00 2001 From: Krishna Dubey <121748506+Krishnadubey1008@users.noreply.github.com> Date: Mon, 7 Apr 2025 15:36:25 +0000 Subject: [PATCH 3/3] Update src/sage/env.py Co-authored-by: Antonio Rojas --- src/sage/env.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/env.py b/src/sage/env.py index 0be48cd08a6..74f0c07e14d 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -192,7 +192,7 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed")) # deprecated # source tree of the Sage distribution -SAGE_ROOT = var("SAGE_ROOT", "") # no fallback for SAGE_ROOT +SAGE_ROOT = var("SAGE_ROOT") or None SAGE_SRC = var("SAGE_SRC", join(SAGE_ROOT, "src"), SAGE_LIB) SAGE_DOC_SRC = var("SAGE_DOC_SRC", join(SAGE_ROOT, "src", "doc"), SAGE_DOC) SAGE_PKGS = var("SAGE_PKGS", join(SAGE_ROOT, "build", "pkgs"))