Commit 5f74854 1 parent f16eb4b commit 5f74854 Copy full SHA for 5f74854
File tree 7 files changed +12
-14
lines changed
7 files changed +12
-14
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,5 @@ conda init bash
8
8
9
9
# Build sage
10
10
conda run -n sage-dev ./bootstrap
11
- conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
12
- conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
11
+ conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-setup
13
12
conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src
Original file line number Diff line number Diff line change @@ -77,21 +77,17 @@ jobs:
77
77
conda info
78
78
conda list
79
79
80
- - name : Configure
80
+ - name : Bootstrap
81
81
shell : bash -l {0}
82
82
continue-on-error : true
83
83
run : |
84
84
./bootstrap
85
- echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
86
- ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX --enable-system-site-packages $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude rpy2); do echo --with-system-$pkg=force; done)
87
- echo "::remove-matcher owner=configure-system-package-warning::"
88
- echo "::remove-matcher owner=configure-system-package-error::"
89
85
90
86
- name : Build
91
87
shell : bash -l {0}
92
88
run : |
93
89
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
94
- pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage- setup
90
+ pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-setup
95
91
pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
96
92
env :
97
93
SAGE_NUM_THREADS : 2
Original file line number Diff line number Diff line change 11
11
&& conda config --append envs_dirs $(pwd)
12
12
&& conda activate $(pwd)/venv
13
13
&& ./bootstrap
14
- && ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX
15
- && pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
14
+ && pip install --no-build-isolation -v -v -e ./pkgs/sage-setup
16
15
&& pip install --no-build-isolation -v -v -e ./src
17
16
# Activate conda environment, set up Trac remote
18
17
# RestructuredText extension recommends python extension, although we have already installed it
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ sage_conf for conda
87
87
88
88
The version of the distribution package in the directory
89
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
90
+ may be used in an installation method of SageMath, where all packages
91
91
are provided by conda. This method is described in
92
92
https://doc.sagemath.org/html/en/installation/conda.html#using-conda-to-provide-all-dependencies-for-the-sage-library-experimental
93
93
Original file line number Diff line number Diff line change @@ -138,9 +138,15 @@ Here we assume that you are using a git checkout.
138
138
- Bootstrap the source tree and install the build prerequisites and the Sage library::
139
139
140
140
$ ./bootstrap
141
- $ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda ./pkgs/sage- setup
141
+ $ pip install --no-build-isolation -v -v --editable ./pkgs/sage-setup
142
142
$ pip install --no-build-isolation --config-settings editable_mode=compat -v -v --editable ./src
143
143
144
+ If you encounter any errors, try to install the ``sage-conf`` package first::
145
+
146
+ $ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda
147
+
148
+ and then run the last command again.
149
+
144
150
- Verify that Sage has been installed::
145
151
146
152
$ sage -c 'print(version())'
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ requires = [
6
6
# Note that PEP517/518 have no notion of optional sage_spkg dependencies:
7
7
# https://github.com/pypa/pip/issues/6144
8
8
esyscmd ( `sage-get-system-packages install-requires-toml \
9
- sage_conf \
10
9
setuptools \
11
10
wheel \
12
11
sage_setup \
Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ include(`setup_cfg_metadata.m4')dnl'
11
11
[ options]
12
12
python_requires = >=3.9, <3.13
13
13
install_requires =
14
- SPKG_INSTALL_REQUIRES_sage_conf
15
14
SPKG_INSTALL_REQUIRES_six
16
15
dnl From build/pkgs/sagelib/dependencies
17
16
SPKG_INSTALL_REQUIRES_conway_polynomials
You can’t perform that action at this time.
0 commit comments