Skip to content

Commit 1838bdf

Browse files
author
Release Manager
committed
gh-36751: Switch sage-conf to modern editable install <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> This modernization eliminates some deprecation warnings during installation. It may help solve the problem of the disappearing sage- conf (https://groups.google.com/g/sage- release/c/J6mGYH56FKA/m/m9yHivCWAgAJ, https://groups.google.com/g/sage- release/c/dvPti2UkyjQ/m/2jeUZROzAwAJ, https://groups.google.com/g/sage- release/c/DeqhtAgi2es/m/DYq13owvAQAJ). No change to how sagelib is installed; this will be taken care of separately (#34209). In combination with #36562, which adds `pyproject.toml` for sage- docbuild, sage-setup, sage-sws2rst, also these distributions are switched to the modern editable install. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36751 Reported by: Matthias Köppe Reviewer(s): John H. Palmieri
2 parents 0a69c2a + 560ab28 commit 1838bdf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build/bin/sage-dist-helpers

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,6 @@ sdh_pip_install() {
289289

290290
sdh_pip_editable_install() {
291291
echo "Installing $PKG_NAME (editable mode)"
292-
# Until https://github.com/sagemath/sage/issues/34209 switches us to PEP 660 editable wheels
293-
export SETUPTOOLS_ENABLE_FEATURES=legacy-editable
294292
python3 -m pip install --verbose --no-deps --no-index --no-build-isolation --isolated --editable "$@" || \
295293
sdh_die "Error installing $PKG_NAME"
296294
}

build/pkgs/sagelib/spkg-install.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ if [ "$SAGE_EDITABLE" = yes ]; then
5151
# and renamed the distribution to "sagemath-standard"). There is no clean way to uninstall
5252
# them, so we just use rm.
5353
(cd "$SITEPACKAGESDIR" && rm -rf sage sage-[1-9]*.egg-info sage-[1-9]*.dist-info)
54+
# Until https://github.com/sagemath/sage/issues/34209 switches us to PEP 660 editable wheels
55+
export SETUPTOOLS_ENABLE_FEATURES=legacy-editable
5456
time sdh_pip_editable_install .
5557

5658
if [ "$SAGE_WHEELS" = yes ]; then

0 commit comments

Comments
 (0)