Skip to content

Commit ada2dbf

Browse files
author
Release Manager
committed
sagemathgh-40327: Remove sage-conf <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> No longer needed after sagemath#39030. Fixes sagemath#40793. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies - sagemath#39030 - sagemath#40357 - sagemath#40765 <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#40327 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
2 parents 7909a2f + 7b5923f commit ada2dbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+317
-768
lines changed

‎.github/workflows/ci-distro.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ on:
1919
paths:
2020
- '.github/workflows/ci-distro.yml'
2121
- 'build/pkgs/**'
22+
- 'build/make/**'
2223
- 'configure.ac'
23-
- '!build/pkgs/sage_conf/**'
24-
- '!build/pkgs/sage_docbuild/**'
25-
- '!build/pkgs/sage_setup/**'
26-
- '!build/pkgs/sage_sws2rst/**'
27-
- '!build/pkgs/sagelib/**'
28-
- '!build/pkgs/sagemath_*/**'
2924
push:
3025
tags:
3126
- '*'
@@ -35,7 +30,7 @@ on:
3530
env:
3631
TARGETS_PRE: all-sage-local
3732
TARGETS: build
38-
TARGETS_OPTIONAL: ptest
33+
TARGETS_OPTIONAL: ptestlong
3934

4035
permissions:
4136
packages: write
@@ -56,7 +51,7 @@ jobs:
5651
# FIXME: duplicated from env.TARGETS
5752
targets_pre: all-sage-local
5853
targets: build
59-
targets_optional: ptest
54+
targets_optional: ptestlong
6055
tox_system_factors: >-
6156
["ubuntu-jammy"]
6257
tox_packages_factors: >-
@@ -71,7 +66,7 @@ jobs:
7166
docker_targets: "with-system-packages configured with-targets-pre with-targets with-targets-optional"
7267
targets_pre: all-sage-local
7368
targets: build
74-
targets_optional: ptest
69+
targets_optional: ptestlong
7570
tox_packages_factors: >-
7671
["standard"]
7772
docker_push_repository: ghcr.io/${{ github.repository }}/

‎.github/workflows/dist.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ jobs:
241241
run: |
242242
"${{ steps.python.outputs.python-path }}" -m pip install cibuildwheel==3.0.1
243243
export PATH=build/bin:$PATH
244-
echo CIBW_BEFORE_ALL="( $(sage-print-system-package-command debian --yes --no-install-recommends install $(sage-get-system-packages debian $SPKGS)) || $(sage-print-system-package-command fedora --yes --no-install-recommends install $(sage-get-system-packages fedora $SPKGS | sed s/pkg-config/pkgconfig/)) || ( $(sage-print-system-package-command homebrew --yes --no-install-recommends install $(sage-get-system-packages homebrew $SPKGS)) || $(sage-print-system-package-command alpine --yes --no-install-recommends install $(sage-get-system-packages alpine $SPKGS)) || echo error ignored) ) && if cp /host/sage-\$AUDITWHEEL_PLAT/config.status . 2>/dev/null; then chmod +x config.status; fi && if [ -x ./config.status ]; then ./config.status; else ./configure --enable-build-as-root ${{ startsWith(matrix.os, 'ubuntu') && '--prefix=/host/sage-\$AUDITWHEEL_PLAT' || '' }} && cp config.status prefix/; fi && MAKE=\"make -j6\" make V=0 $TARGETS_PRE && (echo \"sage_conf @ file://\$(pwd)/pkgs/sage-conf\" && echo \"sage_setup @ file://\$(pwd)/pkgs/sage-setup\") > constraints.txt" >> "$GITHUB_ENV"
244+
echo CIBW_BEFORE_ALL="( $(sage-print-system-package-command debian --yes --no-install-recommends install $(sage-get-system-packages debian $SPKGS)) || $(sage-print-system-package-command fedora --yes --no-install-recommends install $(sage-get-system-packages fedora $SPKGS | sed s/pkg-config/pkgconfig/)) || ( $(sage-print-system-package-command homebrew --yes --no-install-recommends install $(sage-get-system-packages homebrew $SPKGS)) || $(sage-print-system-package-command alpine --yes --no-install-recommends install $(sage-get-system-packages alpine $SPKGS)) || echo error ignored) ) && if cp /host/sage-\$AUDITWHEEL_PLAT/config.status . 2>/dev/null; then chmod +x config.status; fi && if [ -x ./config.status ]; then ./config.status; else ./configure --enable-build-as-root ${{ startsWith(matrix.os, 'ubuntu') && '--prefix=/host/sage-\$AUDITWHEEL_PLAT' || '' }} && cp config.status prefix/; fi && MAKE=\"make -j6\" make V=0 $TARGETS_PRE && echo \"sage_setup @ file://\$(pwd)/pkgs/sage-setup\") > constraints.txt" >> "$GITHUB_ENV"
245245
mkdir -p unpacked
246246
for sdist in dist/$pkg*.tar.gz; do
247247
(cd unpacked && tar xfz - ) < $sdist

‎.gitignore‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,6 @@ build/pkgs/wheel/version_requirements.txt
205205
/pkgs/*/venv*
206206
/pkgs/*/.venv*
207207

208-
/pkgs/sage-conf_pypi/sage_root/config.log
209-
/pkgs/sage-conf_pypi/sage_root/config.status
210-
/pkgs/sage-conf_pypi/sage_root/local/
211-
/pkgs/sage-conf_pypi/sage_root/logs/
212-
/pkgs/sage-conf_pypi/sage_root/prefix
213-
/pkgs/sage-conf_pypi/sage_root/src/bin/sage-env-config
214-
/pkgs/sage-conf_pypi/sage_root/src/bin/sage-src-env-config
215-
/pkgs/sage-conf_pypi/sage_root/upstream/
216-
/pkgs/sage-conf_pypi/sage_root/venv
217-
218208
/pkgs/sagemath-objects/setup.cfg
219209
/pkgs/sagemath-bliss/setup.cfg
220210
/pkgs/sagemath-coxeter3/setup.cfg

‎.vscode/settings.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// Exclude symbolic links into SAGE_ROOT/pkgs/
99
"build/pkgs/*/src": true,
1010
// Exclude symbolic links into SAGE_ROOT/src/
11-
"pkgs/sage-conf_pypi/sage_root": true,
1211
"pkgs/sage-docbuild/sage_docbuild": true,
1312
"pkgs/sage-setup/sage_setup": true,
1413
"pkgs/sagemath-*/sage": true,

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ SAGE_ROOT_LOGS = logs
4242

4343
# CONFIG_FILES lists all files that appear in AC_CONFIG_FILES in configure.ac;
4444
# except for build/make/Makefile-auto, which is unused by the build system
45-
CONFIG_FILES = build/make/Makefile src/bin/sage-env-config build/bin/sage-build-env-config pkgs/sage-conf/_sage_conf/_conf.py
45+
CONFIG_FILES = build/make/Makefile src/bin/sage-env-config build/bin/sage-build-env-config
4646

4747
# SPKG_COLLECT_FILES contains the files that influence the *runtime* of the
4848
# portions of the 'configure' script generated by the SAGE_SPKG_COLLECT macro

‎README.md‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -434,50 +434,6 @@ in the Installation Guide.
434434
[Launching SageMath](https://doc.sagemath.org/html/en/installation/launching.html)
435435
in the Sage Installation Guide.
436436

437-
Alternative Installation using PyPI
438-
---------------
439-
440-
For installing Sage in a Python environment from PyPI, Sage provides the
441-
`pip`-installable package [sagemath-standard](https://pypi.org/project/sagemath-standard/).
442-
443-
Unless you need to install Sage into a specific existing environment, we recommend
444-
to create and activate a fresh virtual environment, for example `~/sage-venv/`:
445-
446-
$ python3 -m venv ~/sage-venv
447-
$ source ~/sage-venv/bin/activate
448-
449-
As the first installation step, install [sage_conf](https://pypi.org/project/sage-conf/),
450-
which builds various prerequisite packages in a subdirectory of `~/.sage/`:
451-
452-
(sage-venv) $ python3 -m pip install -v sage_conf
453-
454-
After a successful installation, a wheelhouse provides various Python packages.
455-
You can list the wheels using the command:
456-
457-
(sage-venv) $ ls $(sage-config SAGE_SPKG_WHEELS)
458-
459-
If this gives an error saying that `sage-config` is not found, check any messages
460-
that the `pip install` command may have printed. You may need to adjust your `PATH`,
461-
for example by:
462-
463-
$ export PATH="$(python3 -c 'import sysconfig; print(sysconfig.get_path("scripts", "posix_user"))'):$PATH"
464-
465-
Now install the packages from the wheelhouse and the [sage_setup](https://pypi.org/project/sage-conf/)
466-
package, and finally install the Sage library:
467-
468-
(sage-venv) $ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl sage_setup
469-
(sage-venv) $ python3 -m pip install --no-build-isolation -v sagemath-standard
470-
471-
The above instructions install the latest stable release of Sage.
472-
To install the latest development version instead, add the switch `--pre` to all invocations of
473-
`python3 -m pip install`.
474-
475-
**NOTE:** PyPI has various other `pip`-installable packages with the word "sage" in their names.
476-
Some of them are maintained by the SageMath project, some are provided by SageMath users for
477-
various purposes, and others are entirely unrelated to SageMath. Do not use the packages
478-
`sage` and `sagemath`. For a curated list of packages, see the chapter
479-
[Packages and Features](https://doc.sagemath.org/html/en/reference/spkg/index.html) of the
480-
Sage Reference Manual.
481437

482438
SageMath Docker images
483439
----------------------
@@ -530,9 +486,6 @@ SAGE_ROOT Root directory (create by git clone)
530486
├── configure Top-level configure script
531487
├── COPYING.txt Copyright information
532488
├── pkgs Source trees of Python distribution packages
533-
│ ├── sage-conf
534-
│ │ ├── sage_conf.py
535-
│ │ └── setup.py
536489
│ ├── sage-docbuild
537490
│ │ ├── sage_docbuild/
538491
│ │ └── setup.py

‎build/bin/sage-dist-helpers‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ sdh_actually_pip_install_wheel() {
395395
shift
396396
# Issue #32659: pip no longer reinstalls local wheels if the version is the same.
397397
# Because neither (1) applying patches nor (2) local changes (in the case
398-
# of sage-conf, sage-setup, etc.) bump the version number, we need to
398+
# of sage-setup, etc.) bump the version number, we need to
399399
# override this behavior. The pip install option --force-reinstall does too
400400
# much -- it also reinstalls all dependencies, which we do not want.
401401
$sudo sage-pip-uninstall "$distname" 2>&1 | sed '/^WARNING: Skipping .* as it is not installed./d'

‎build/make/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ PYPI_WHEEL_PACKAGES = \
141141

142142
# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
143143
WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \
144-
sage_conf \
145144
sagelib \
146145
sage_docbuild
147146

‎build/pkgs/sage_conf/SPKG.rst‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/pkgs/sage_conf/dependencies‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)