Skip to content

Provided a default value for SAGE_ROOT that can be overridden by an environment variable or configuration file #39885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 18, 2025
Merged

Provided a default value for SAGE_ROOT that can be overridden by an environment variable or configuration file #39885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdef541
Provided a default value for SAGE_ROOT that can be overridden by an e…
Krishnadubey1008 Apr 5, 2025
b50bd0c
fixed meson.build and env.py
Krishnadubey1008 Apr 7, 2025
cbd008e
Update src/sage/env.py
Krishnadubey1008 Apr 7, 2025
83e10d2
Merge branch 'develop' into fix_sage_root
Krishnadubey1008 Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sage/env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
1 change: 0 additions & 1 deletion src/sage/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading