Skip to content

Commit 056d126

Browse files
author
Matthias Koeppe
committed
Update README and messages
1 parent b4a0d0a commit 056d126

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

pkgs/sage-conf/README.rst

+11-1
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,20 @@ sage_conf in the SageMath distribution
7878
The original version of the distribution package ``sage_conf`` is used
7979
internally in the SageMath distribution. It is provided in the directory
8080
`pkgs/sage-conf <https://github.com/sagemath/sage/tree/develop/pkgs/sage-conf/>`_.
81-
This version of the package is generated by the Sage distribution's ``configure``
81+
This version of the package is generated by the Sage distribution's ``./configure``
8282
script.
8383

8484

85+
sage_conf for conda
86+
-------------------
87+
88+
The version of the distribution package in the directory
89+
`pkgs/sage-conf_conda <https://github.com/sagemath/sage/tree/develop/pkgs/sage-conf_conda/>`_
90+
is used in an experimental installation method of SageMath, where all packages
91+
are provided by conda. This method is described in
92+
https://doc.sagemath.org/html/en/installation/conda.html#using-conda-to-provide-all-dependencies-for-the-sage-library-experimental
93+
94+
8595
sage_conf in downstream distributions
8696
-------------------------------------
8797

pkgs/sage-conf_conda/setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ def run(self):
3434
if os.system(cmd) != 0:
3535
if os.path.exists(os.path.join(SAGE_ROOT, 'config.status')):
3636
print("Warning: A configuration has been written, but the configure script has exited with an error. "
37-
"Carefully check any error messages before continuing.")
37+
"Carefully check any messages above before continuing.")
3838
else:
3939
print(f"Error: The configure script has failed; this may be caused by missing build prerequisites.")
4040
sys.stdout.flush()
4141
PREREQ_SPKG = "_prereq bzip2 xz libffi" # includes python3 SPKG_DEPCHECK packages
42-
os.system(f'cd {SAGE_ROOT} && export SYSTEM=$(build/bin/sage-guess-package-system 2>/dev/null) && export PACKAGES="$(build/bin/sage-get-system-packages $SYSTEM {PREREQ_SPKG})" && [ -n "$PACKAGES" ] && echo "You can install the required build prerequisites using the following shell command" && echo "" && build/bin/sage-print-system-package-command $SYSTEM --verbose --sudo install $PACKAGES && echo ""')
42+
os.system(f'cd {SAGE_ROOT} && export PACKAGES="$(build/bin/sage-get-system-packages conda {PREREQ_SPKG})" && [ -n "$PACKAGES" ] && echo "You can install the required build prerequisites using the following shell command" && echo "" && build/bin/sage-print-system-package-command conda --verbose --sudo install $PACKAGES && echo ""')
4343
raise SetupError("configure failed")
4444

4545
# In this mode, we never run "make".

0 commit comments

Comments
 (0)