diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index b73313f4a4c..916b4de8b06 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -247,25 +247,6 @@ jobs: (cd unpacked && tar xfz - ) < $sdist done - - name: sagemath-bliss - run: | - "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*bliss* - - - name: sagemath-coxeter3 - run: | - "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*coxeter3* - - - name: sagemath-mcqd - run: | - "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*mcqd* - - - name: sagemath-tdlib - run: | - case "${{ matrix.arch }}" in - i686) ;; # broken - boost-related - *) "${{ steps.python.outputs.python-path }}" -m cibuildwheel unpacked/sagemath*tdlib* - esac - - uses: actions/upload-artifact@v4 with: name: ${{ matrix.os }}-${{ matrix.build }}-${{ matrix.arch }}-wheels diff --git a/.gitignore b/.gitignore index cb4e781e634..7006a8999f7 100644 --- a/.gitignore +++ b/.gitignore @@ -206,32 +206,14 @@ build/pkgs/wheel/version_requirements.txt /pkgs/*/.venv* /pkgs/sagemath-objects/setup.cfg -/pkgs/sagemath-bliss/setup.cfg -/pkgs/sagemath-coxeter3/setup.cfg -/pkgs/sagemath-mcqd/setup.cfg -/pkgs/sagemath-meataxe/setup.cfg -/pkgs/sagemath-sirocco/setup.cfg -/pkgs/sagemath-tdlib/setup.cfg /pkgs/sagemath-categories/setup.cfg /pkgs/sagemath-environment/setup.cfg /pkgs/sagemath-repl/setup.cfg /pkgs/sagemath-objects/pyproject.toml -/pkgs/sagemath-bliss/pyproject.toml -/pkgs/sagemath-coxeter3/pyproject.toml -/pkgs/sagemath-mcqd/pyproject.toml -/pkgs/sagemath-meataxe/pyproject.toml -/pkgs/sagemath-sirocco/pyproject.toml -/pkgs/sagemath-tdlib/pyproject.toml /pkgs/sagemath-categories/pyproject.toml /pkgs/sagemath-environment/pyproject.toml /pkgs/sagemath-repl/pyproject.toml /pkgs/sagemath-objects/requirements*.txt -/pkgs/sagemath-bliss/requirements*.txt -/pkgs/sagemath-coxeter3/requirements*.txt -/pkgs/sagemath-mcqd/requirements*.txt -/pkgs/sagemath-meataxe/requirements*.txt -/pkgs/sagemath-sirocco/requirements*.txt -/pkgs/sagemath-tdlib/requirements*.txt /pkgs/sagemath-categories/requirements*.txt /pkgs/sagemath-environment/requirements*.txt /pkgs/sagemath-repl/requirements*.txt diff --git a/build/make/Makefile.in b/build/make/Makefile.in index 54633fbf78d..ff7ed18135e 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -130,15 +130,6 @@ PIP_PACKAGES = @SAGE_PIP_PACKAGES@ # Packages that use the 'script' package build rules SCRIPT_PACKAGES = @SAGE_SCRIPT_PACKAGES@ -# Packages for which we build wheels for PyPI -PYPI_WHEEL_PACKAGES = \ - sagemath_bliss \ - sagemath_mcqd \ - sagemath_tdlib \ - sagemath_coxeter3 \ - sagemath_sirocco \ - sagemath_meataxe - # sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \ sagelib \ diff --git a/build/pkgs/sagemath_bliss/SPKG.rst b/build/pkgs/sagemath_bliss/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sagemath_bliss/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/bootstrap b/build/pkgs/sagemath_bliss/bootstrap deleted file mode 120000 index 40542346a4e..00000000000 --- a/build/pkgs/sagemath_bliss/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies deleted file mode 100644 index 8e5c304aae9..00000000000 --- a/build/pkgs/sagemath_bliss/dependencies +++ /dev/null @@ -1 +0,0 @@ - bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_bliss/distros/conda.txt b/build/pkgs/sagemath_bliss/distros/conda.txt deleted file mode 100644 index d6139d966ec..00000000000 --- a/build/pkgs/sagemath_bliss/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -sagemath-bliss diff --git a/build/pkgs/sagemath_bliss/package-version.txt b/build/pkgs/sagemath_bliss/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sagemath_bliss/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/spkg-install.in b/build/pkgs/sagemath_bliss/spkg-install.in deleted file mode 100644 index b880be42726..00000000000 --- a/build/pkgs/sagemath_bliss/spkg-install.in +++ /dev/null @@ -1,9 +0,0 @@ -cd src - -export PIP_NO_INDEX=true -export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" - -# Modularized install via wheels -# --no-build-isolation so that declared build dependencies, -# in particular sagemath-environment do not have to be present as wheels. -sdh_pip_install --no-build-isolation . diff --git a/build/pkgs/sagemath_bliss/spkg-src b/build/pkgs/sagemath_bliss/spkg-src deleted file mode 100755 index 483b2f349e3..00000000000 --- a/build/pkgs/sagemath_bliss/spkg-src +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sagemath-bliss -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_bliss/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd build/pkgs/sagemath_bliss - -cd src -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_bliss/src b/build/pkgs/sagemath_bliss/src deleted file mode 120000 index 51c70b82b95..00000000000 --- a/build/pkgs/sagemath_bliss/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-bliss \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/type b/build/pkgs/sagemath_bliss/type deleted file mode 100644 index 134d9bc32d5..00000000000 --- a/build/pkgs/sagemath_bliss/type +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/build/pkgs/sagemath_bliss/version_requirements.txt b/build/pkgs/sagemath_bliss/version_requirements.txt deleted file mode 100644 index 1536b4e914c..00000000000 --- a/build/pkgs/sagemath_bliss/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sagemath-bliss ~= 10.8b7 diff --git a/build/pkgs/sagemath_coxeter3/SPKG.rst b/build/pkgs/sagemath_coxeter3/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sagemath_coxeter3/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/bootstrap b/build/pkgs/sagemath_coxeter3/bootstrap deleted file mode 120000 index 40542346a4e..00000000000 --- a/build/pkgs/sagemath_coxeter3/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies deleted file mode 100644 index ada45656089..00000000000 --- a/build/pkgs/sagemath_coxeter3/dependencies +++ /dev/null @@ -1 +0,0 @@ - coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_coxeter3/package-version.txt b/build/pkgs/sagemath_coxeter3/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sagemath_coxeter3/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/spkg-install.in b/build/pkgs/sagemath_coxeter3/spkg-install.in deleted file mode 120000 index e38ca3ace8b..00000000000 --- a/build/pkgs/sagemath_coxeter3/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -../sagemath_bliss/spkg-install.in \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/spkg-src b/build/pkgs/sagemath_coxeter3/spkg-src deleted file mode 100755 index df635f450cf..00000000000 --- a/build/pkgs/sagemath_coxeter3/spkg-src +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sagemath-coxeter3 -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_coxeter3/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd build/pkgs/sagemath_coxeter3 - -cd src -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_coxeter3/src b/build/pkgs/sagemath_coxeter3/src deleted file mode 120000 index a9a1c8ae443..00000000000 --- a/build/pkgs/sagemath_coxeter3/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-coxeter3 \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/type b/build/pkgs/sagemath_coxeter3/type deleted file mode 100644 index 134d9bc32d5..00000000000 --- a/build/pkgs/sagemath_coxeter3/type +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/build/pkgs/sagemath_coxeter3/version_requirements.txt b/build/pkgs/sagemath_coxeter3/version_requirements.txt deleted file mode 100644 index e74a7945177..00000000000 --- a/build/pkgs/sagemath_coxeter3/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sagemath-coxeter3 ~= 10.8b7 diff --git a/build/pkgs/sagemath_mcqd/SPKG.rst b/build/pkgs/sagemath_mcqd/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sagemath_mcqd/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/bootstrap b/build/pkgs/sagemath_mcqd/bootstrap deleted file mode 120000 index 40542346a4e..00000000000 --- a/build/pkgs/sagemath_mcqd/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies deleted file mode 100644 index 9896fdaccfc..00000000000 --- a/build/pkgs/sagemath_mcqd/dependencies +++ /dev/null @@ -1 +0,0 @@ - mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_mcqd/package-version.txt b/build/pkgs/sagemath_mcqd/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sagemath_mcqd/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/spkg-install.in b/build/pkgs/sagemath_mcqd/spkg-install.in deleted file mode 120000 index e38ca3ace8b..00000000000 --- a/build/pkgs/sagemath_mcqd/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -../sagemath_bliss/spkg-install.in \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/spkg-src b/build/pkgs/sagemath_mcqd/spkg-src deleted file mode 100755 index c1602f0953e..00000000000 --- a/build/pkgs/sagemath_mcqd/spkg-src +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sagemath-mcqd -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_mcqd/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd build/pkgs/sagemath_mcqd - -cd src -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_mcqd/src b/build/pkgs/sagemath_mcqd/src deleted file mode 120000 index 03d68b8cbe3..00000000000 --- a/build/pkgs/sagemath_mcqd/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-mcqd \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/type b/build/pkgs/sagemath_mcqd/type deleted file mode 100644 index 134d9bc32d5..00000000000 --- a/build/pkgs/sagemath_mcqd/type +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/build/pkgs/sagemath_mcqd/version_requirements.txt b/build/pkgs/sagemath_mcqd/version_requirements.txt deleted file mode 100644 index 4dfd2db4251..00000000000 --- a/build/pkgs/sagemath_mcqd/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sagemath-mcqd ~= 10.8b7 diff --git a/build/pkgs/sagemath_meataxe/SPKG.rst b/build/pkgs/sagemath_meataxe/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sagemath_meataxe/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/bootstrap b/build/pkgs/sagemath_meataxe/bootstrap deleted file mode 120000 index 40542346a4e..00000000000 --- a/build/pkgs/sagemath_meataxe/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies deleted file mode 100644 index a287829b5df..00000000000 --- a/build/pkgs/sagemath_meataxe/dependencies +++ /dev/null @@ -1 +0,0 @@ - meataxe cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_meataxe/package-version.txt b/build/pkgs/sagemath_meataxe/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sagemath_meataxe/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/spkg-install.in b/build/pkgs/sagemath_meataxe/spkg-install.in deleted file mode 120000 index e38ca3ace8b..00000000000 --- a/build/pkgs/sagemath_meataxe/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -../sagemath_bliss/spkg-install.in \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/spkg-src b/build/pkgs/sagemath_meataxe/spkg-src deleted file mode 100755 index a0e05c1fc98..00000000000 --- a/build/pkgs/sagemath_meataxe/spkg-src +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sagemath-meataxe -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_meataxe/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd build/pkgs/sagemath_meataxe - -cd src -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_meataxe/src b/build/pkgs/sagemath_meataxe/src deleted file mode 120000 index 1164dd787fd..00000000000 --- a/build/pkgs/sagemath_meataxe/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-meataxe \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/type b/build/pkgs/sagemath_meataxe/type deleted file mode 100644 index 134d9bc32d5..00000000000 --- a/build/pkgs/sagemath_meataxe/type +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/build/pkgs/sagemath_meataxe/version_requirements.txt b/build/pkgs/sagemath_meataxe/version_requirements.txt deleted file mode 100644 index a2779b191ca..00000000000 --- a/build/pkgs/sagemath_meataxe/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sagemath-meataxe ~= 10.8b7 diff --git a/build/pkgs/sagemath_sirocco/SPKG.rst b/build/pkgs/sagemath_sirocco/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sagemath_sirocco/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/bootstrap b/build/pkgs/sagemath_sirocco/bootstrap deleted file mode 120000 index 40542346a4e..00000000000 --- a/build/pkgs/sagemath_sirocco/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies deleted file mode 100644 index 4f47049ec4b..00000000000 --- a/build/pkgs/sagemath_sirocco/dependencies +++ /dev/null @@ -1 +0,0 @@ - sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_sirocco/distros/conda.txt b/build/pkgs/sagemath_sirocco/distros/conda.txt deleted file mode 100644 index fc9cfb79706..00000000000 --- a/build/pkgs/sagemath_sirocco/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -sagemath-sirocco diff --git a/build/pkgs/sagemath_sirocco/package-version.txt b/build/pkgs/sagemath_sirocco/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sagemath_sirocco/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/spkg-install.in b/build/pkgs/sagemath_sirocco/spkg-install.in deleted file mode 120000 index e38ca3ace8b..00000000000 --- a/build/pkgs/sagemath_sirocco/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -../sagemath_bliss/spkg-install.in \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/spkg-src b/build/pkgs/sagemath_sirocco/spkg-src deleted file mode 100755 index 4082abf43b2..00000000000 --- a/build/pkgs/sagemath_sirocco/spkg-src +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sagemath-sirocco -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_sirocco/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd build/pkgs/sagemath_sirocco - -cd src -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_sirocco/src b/build/pkgs/sagemath_sirocco/src deleted file mode 120000 index 03d0d674991..00000000000 --- a/build/pkgs/sagemath_sirocco/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-sirocco \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/type b/build/pkgs/sagemath_sirocco/type deleted file mode 100644 index 134d9bc32d5..00000000000 --- a/build/pkgs/sagemath_sirocco/type +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/build/pkgs/sagemath_sirocco/version_requirements.txt b/build/pkgs/sagemath_sirocco/version_requirements.txt deleted file mode 100644 index 4998c28b0db..00000000000 --- a/build/pkgs/sagemath_sirocco/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sagemath-sirocco ~= 10.8b7 diff --git a/build/pkgs/sagemath_tdlib/SPKG.rst b/build/pkgs/sagemath_tdlib/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sagemath_tdlib/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/bootstrap b/build/pkgs/sagemath_tdlib/bootstrap deleted file mode 120000 index 40542346a4e..00000000000 --- a/build/pkgs/sagemath_tdlib/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies deleted file mode 100644 index b22ab6c52a7..00000000000 --- a/build/pkgs/sagemath_tdlib/dependencies +++ /dev/null @@ -1 +0,0 @@ - tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/build/pkgs/sagemath_tdlib/package-version.txt b/build/pkgs/sagemath_tdlib/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sagemath_tdlib/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/spkg-install.in b/build/pkgs/sagemath_tdlib/spkg-install.in deleted file mode 120000 index e38ca3ace8b..00000000000 --- a/build/pkgs/sagemath_tdlib/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -../sagemath_bliss/spkg-install.in \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/spkg-src b/build/pkgs/sagemath_tdlib/spkg-src deleted file mode 100755 index 88e67414c05..00000000000 --- a/build/pkgs/sagemath_tdlib/spkg-src +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sagemath-tdlib -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sagemath_tdlib/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd build/pkgs/sagemath_tdlib - -cd src -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_tdlib/src b/build/pkgs/sagemath_tdlib/src deleted file mode 120000 index 0d238df793e..00000000000 --- a/build/pkgs/sagemath_tdlib/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sagemath-tdlib \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/type b/build/pkgs/sagemath_tdlib/type deleted file mode 100644 index 134d9bc32d5..00000000000 --- a/build/pkgs/sagemath_tdlib/type +++ /dev/null @@ -1 +0,0 @@ -optional diff --git a/build/pkgs/sagemath_tdlib/version_requirements.txt b/build/pkgs/sagemath_tdlib/version_requirements.txt deleted file mode 100644 index 2b5c91b16ae..00000000000 --- a/build/pkgs/sagemath_tdlib/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sagemath-tdlib ~= 10.8b7 diff --git a/constraints_pkgs.txt b/constraints_pkgs.txt index a557ed04f92..7e5afa8b05e 100644 --- a/constraints_pkgs.txt +++ b/constraints_pkgs.txt @@ -24,14 +24,8 @@ # sage_docbuild @ file://${SAGE_ROOT}/pkgs/sage-docbuild sage_setup @ file://${SAGE_ROOT}/pkgs/sage-setup -sagemath-bliss @ file://${SAGE_ROOT}/pkgs/sagemath-bliss sagemath-categories @ file://${SAGE_ROOT}/pkgs/sagemath-categories -sagemath-coxeter3 @ file://${SAGE_ROOT}/pkgs/sagemath-coxeter3 sagemath-environment @ file://${SAGE_ROOT}/pkgs/sagemath-environment -sagemath-mcqd @ file://${SAGE_ROOT}/pkgs/sagemath-mcqd -sagemath-meataxe @ file://${SAGE_ROOT}/pkgs/sagemath-meataxe sagemath-objects @ file://${SAGE_ROOT}/pkgs/sagemath-objects sagemath-repl @ file://${SAGE_ROOT}/pkgs/sagemath-repl -sagemath-sirocco @ file://${SAGE_ROOT}/pkgs/sagemath-sirocco sagemath-standard @ file://${SAGE_ROOT}/pkgs/sagemath-standard -sagemath-tdlib @ file://${SAGE_ROOT}/pkgs/sagemath-tdlib diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in deleted file mode 100644 index 2572c2b46f7..00000000000 --- a/pkgs/sagemath-bliss/MANIFEST.in +++ /dev/null @@ -1,21 +0,0 @@ -prune sage - -include VERSION.txt - -graft sage/graphs/bliss_cpp -include sage/graphs/bliss.p* - -global-exclude *.c -global-exclude *.cpp - -global-exclude all__sagemath_*.* -global-include all__sagemath_bliss.py - -global-exclude __pycache__ -global-exclude *.py[co] -global-exclude *.bak -global-exclude *.so -global-exclude *~ -prune .tox -prune build -prune dist diff --git a/pkgs/sagemath-bliss/README.rst b/pkgs/sagemath-bliss/README.rst deleted file mode 100644 index b1a27056fd4..00000000000 --- a/pkgs/sagemath-bliss/README.rst +++ /dev/null @@ -1,29 +0,0 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with bliss -============================================================================== - -About SageMath --------------- - - "Creating a Viable Open Source Alternative to - Magma, Maple, Mathematica, and MATLAB" - - Copyright (C) 2005-2024 The Sage Development Team - - https://www.sagemath.org - -SageMath fully supports all major Linux distributions, recent versions of -macOS, and Windows (Windows Subsystem for Linux). - -See https://doc.sagemath.org/html/en/installation/index.html -for general installation instructions. - - -About this pip-installable source distribution ----------------------------------------------- - -This pip-installable source distribution ``sagemath-bliss`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``bliss`` library for the purpose -of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt deleted file mode 100644 index c1c2af9c3a4..00000000000 --- a/pkgs/sagemath-bliss/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.8.beta8 diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 deleted file mode 100644 index 7f5321551f3..00000000000 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ /dev/null @@ -1,34 +0,0 @@ -include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- -[build-system] -# Minimum requirements for the build system to execute. -requires = [ - SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment - SPKG_INSTALL_REQUIRES_cython - SPKG_INSTALL_REQUIRES_cysignals - SPKG_INSTALL_REQUIRES_pkgconfig -] -build-backend = "setuptools.build_meta" - -[project] -name = "sagemath-bliss" -description = "Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with bliss" -dependencies = [ - SPKG_INSTALL_REQUIRES_cysignals -] -dynamic = ["version"] -include(`pyproject_toml_metadata.m4')dnl' - -[project.readme] -file = "README.rst" -content-type = "text/x-rst" - -[project.optional-dependencies] -test = [SPKG_INSTALL_REQUIRES_sagemath_repl] - -[tool.setuptools] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} diff --git a/pkgs/sagemath-bliss/requirements.txt.m4 b/pkgs/sagemath-bliss/requirements.txt.m4 deleted file mode 100644 index 8b6ca03b0b9..00000000000 --- a/pkgs/sagemath-bliss/requirements.txt.m4 +++ /dev/null @@ -1,2 +0,0 @@ -Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') -sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-bliss/sage b/pkgs/sagemath-bliss/sage deleted file mode 120000 index e0da5daa6f2..00000000000 --- a/pkgs/sagemath-bliss/sage +++ /dev/null @@ -1 +0,0 @@ -../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-bliss/setup.py b/pkgs/sagemath-bliss/setup.py deleted file mode 100644 index 40f26bd8ead..00000000000 --- a/pkgs/sagemath-bliss/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python - -from distutils import log -from setuptools import setup - -# Work around a Cython problem in Python 3.8.x on macOS -# https://github.com/cython/cython/issues/3262 -import os -if os.uname().sysname == 'Darwin': - import multiprocessing - multiprocessing.set_start_method('fork', force=True) - -# If build isolation is not in use and setuptools_scm is installed, -# then its file_finders entry point is invoked, which we don't need. -# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 -try: - import setuptools_scm.integration - setuptools_scm.integration.find_files = lambda _: [] -except ImportError: - pass - -# PEP 517 builds do not have . in sys.path -import sys -sys.path.insert(0, os.path.dirname(__file__)) - -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False - -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook - - from sage_setup.setenv import setenv - setenv() - - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () - - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - from sage_setup.command.sage_build_py import sage_build_py - sage_build_cython.built_distributions = ['sagemath-bliss'] - - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext, - build_py=sage_build_py) - -from sage_setup.find import find_python_sources -python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-bliss']) - -log.warn('python_packages = {0}'.format(python_packages)) -log.warn('python_modules = {0}'.format(python_modules)) -log.warn('cython_modules = {0}'.format(cython_modules)) - -setup( - cmdclass = cmdclass, - packages = python_packages, - py_modules = python_modules, - ext_modules = cython_modules, -) diff --git a/pkgs/sagemath-coxeter3/MANIFEST.in b/pkgs/sagemath-coxeter3/MANIFEST.in deleted file mode 100644 index a69f2e71363..00000000000 --- a/pkgs/sagemath-coxeter3/MANIFEST.in +++ /dev/null @@ -1,20 +0,0 @@ -prune sage - -include VERSION.txt - -graft sage/libs/coxeter3 - -global-exclude *.c -global-exclude *.cpp - -global-exclude all__sagemath_*.* -global-include all__sagemath_coxeter3.py - -global-exclude __pycache__ -global-exclude *.py[co] -global-exclude *.bak -global-exclude *.so -global-exclude *~ -prune .tox -prune build -prune dist diff --git a/pkgs/sagemath-coxeter3/README.rst b/pkgs/sagemath-coxeter3/README.rst deleted file mode 100644 index 4df12768344..00000000000 --- a/pkgs/sagemath-coxeter3/README.rst +++ /dev/null @@ -1,28 +0,0 @@ -==================================================================================================================== - Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3 -==================================================================================================================== - -About SageMath --------------- - - "Creating a Viable Open Source Alternative to - Magma, Maple, Mathematica, and MATLAB" - - Copyright (C) 2005-2024 The Sage Development Team - - https://www.sagemath.org - -SageMath fully supports all major Linux distributions, recent versions of -macOS, and Windows (Windows Subsystem for Linux). - -See https://doc.sagemath.org/html/en/installation/index.html -for general installation instructions. - - -About this pip-installable source distribution ----------------------------------------------- - -This pip-installable source distribution ``sagemath-coxeter3`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``coxeter3`` library. diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt deleted file mode 100644 index c1c2af9c3a4..00000000000 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.8.beta8 diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 deleted file mode 100644 index 58d4483f8bd..00000000000 --- a/pkgs/sagemath-coxeter3/pyproject.toml.m4 +++ /dev/null @@ -1,37 +0,0 @@ -include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- -[build-system] -# Minimum requirements for the build system to execute. -requires = [ - SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment - SPKG_INSTALL_REQUIRES_sagemath_objects - SPKG_INSTALL_REQUIRES_cython - SPKG_INSTALL_REQUIRES_cysignals - SPKG_INSTALL_REQUIRES_pkgconfig -] -build-backend = "setuptools.build_meta" - -[project] -name = "sagemath-coxeter3" -description = "Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3" -dependencies = [] -dynamic = ["version"] -include(`pyproject_toml_metadata.m4')dnl' - -[project.readme] -file = "README.rst" -content-type = "text/x-rst" - -[tool.setuptools] -packages = ["sage.libs.coxeter3"] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} - -[tool.setuptools.package-data] -"sage.libs.coxeter3" = [ - "coxeter.pxd", - "decl.pxd", -] diff --git a/pkgs/sagemath-coxeter3/requirements.txt.m4 b/pkgs/sagemath-coxeter3/requirements.txt.m4 deleted file mode 100644 index 8b6ca03b0b9..00000000000 --- a/pkgs/sagemath-coxeter3/requirements.txt.m4 +++ /dev/null @@ -1,2 +0,0 @@ -Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') -sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-coxeter3/sage b/pkgs/sagemath-coxeter3/sage deleted file mode 120000 index e0da5daa6f2..00000000000 --- a/pkgs/sagemath-coxeter3/sage +++ /dev/null @@ -1 +0,0 @@ -../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-coxeter3/setup.py b/pkgs/sagemath-coxeter3/setup.py deleted file mode 100644 index 1979cf43a46..00000000000 --- a/pkgs/sagemath-coxeter3/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python - -from distutils import log -from setuptools import setup - -# Work around a Cython problem in Python 3.8.x on macOS -# https://github.com/cython/cython/issues/3262 -import os -if os.uname().sysname == 'Darwin': - import multiprocessing - multiprocessing.set_start_method('fork', force=True) - -# If build isolation is not in use and setuptools_scm is installed, -# then its file_finders entry point is invoked, which we don't need. -# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 -try: - import setuptools_scm.integration - setuptools_scm.integration.find_files = lambda _: [] -except ImportError: - pass - -# PEP 517 builds do not have . in sys.path -import sys -sys.path.insert(0, os.path.dirname(__file__)) - -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False - -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook - - from sage_setup.setenv import setenv - setenv() - - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () - - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - from sage_setup.command.sage_build_py import sage_build_py - sage_build_cython.built_distributions = ['sagemath-coxeter3'] - - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext, - build_py=sage_build_py) - -from sage_setup.find import find_python_sources -python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-coxeter3']) - -log.warn('python_packages = {0}'.format(python_packages)) -log.warn('python_modules = {0}'.format(python_modules)) -log.warn('cython_modules = {0}'.format(cython_modules)) - -setup( - cmdclass = cmdclass, - packages = python_packages, - py_modules = python_modules, - ext_modules = cython_modules, -) diff --git a/pkgs/sagemath-mcqd/MANIFEST.in b/pkgs/sagemath-mcqd/MANIFEST.in deleted file mode 100644 index 801e1b3e48d..00000000000 --- a/pkgs/sagemath-mcqd/MANIFEST.in +++ /dev/null @@ -1,20 +0,0 @@ -prune sage - -include VERSION.txt - -include sage/graphs/mcqd.p* - -global-exclude *.c -global-exclude *.cpp - -global-exclude all__sagemath_*.* -global-include all__sagemath_mcqd.py - -global-exclude __pycache__ -global-exclude *.py[co] -global-exclude *.bak -global-exclude *.so -global-exclude *~ -prune .tox -prune build -prune dist diff --git a/pkgs/sagemath-mcqd/README.rst b/pkgs/sagemath-mcqd/README.rst deleted file mode 100644 index a0da3415874..00000000000 --- a/pkgs/sagemath-mcqd/README.rst +++ /dev/null @@ -1,30 +0,0 @@ -=========================================================================== - Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd -=========================================================================== - -About SageMath --------------- - - "Creating a Viable Open Source Alternative to - Magma, Maple, Mathematica, and MATLAB" - - Copyright (C) 2005-2024 The Sage Development Team - - https://www.sagemath.org - -SageMath fully supports all major Linux distributions, recent versions of -macOS, and Windows (Windows Subsystem for Linux). - -See https://doc.sagemath.org/html/en/installation/index.html -for general installation instructions. - - -About this pip-installable source distribution ----------------------------------------------- - -This pip-installable source distribution ``sagemath-mcqd`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``mcqd`` library, -providing a fast exact algorithm for finding a maximum clique in -an undirected graph. diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt deleted file mode 100644 index c1c2af9c3a4..00000000000 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.8.beta8 diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 deleted file mode 100644 index 55a58611334..00000000000 --- a/pkgs/sagemath-mcqd/pyproject.toml.m4 +++ /dev/null @@ -1,37 +0,0 @@ -include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- -[build-system] -# Minimum requirements for the build system to execute. -requires = [ - SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment - SPKG_INSTALL_REQUIRES_cython - SPKG_INSTALL_REQUIRES_memory_allocator - SPKG_INSTALL_REQUIRES_cysignals - SPKG_INSTALL_REQUIRES_pkgconfig -] -build-backend = "setuptools.build_meta" - -[project] -name = "sagemath-mcqd" -description = "Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd" -dependencies = [ - SPKG_INSTALL_REQUIRES_memory_allocator - SPKG_INSTALL_REQUIRES_cysignals -] -dynamic = ["version"] -include(`pyproject_toml_metadata.m4')dnl' - -[project.readme] -file = "README.rst" -content-type = "text/x-rst" - -[tool.setuptools] -packages = ["sage.graphs"] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} - -[tool.setuptools.package-data] -"sage.graphs" = ["mcqd.pxd"] diff --git a/pkgs/sagemath-mcqd/requirements.txt.m4 b/pkgs/sagemath-mcqd/requirements.txt.m4 deleted file mode 100644 index 8b6ca03b0b9..00000000000 --- a/pkgs/sagemath-mcqd/requirements.txt.m4 +++ /dev/null @@ -1,2 +0,0 @@ -Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') -sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-mcqd/sage b/pkgs/sagemath-mcqd/sage deleted file mode 120000 index e0da5daa6f2..00000000000 --- a/pkgs/sagemath-mcqd/sage +++ /dev/null @@ -1 +0,0 @@ -../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-mcqd/setup.py b/pkgs/sagemath-mcqd/setup.py deleted file mode 100644 index 8cbcf6477c2..00000000000 --- a/pkgs/sagemath-mcqd/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python - -from distutils import log -from setuptools import setup - -# Work around a Cython problem in Python 3.8.x on macOS -# https://github.com/cython/cython/issues/3262 -import os -if os.uname().sysname == 'Darwin': - import multiprocessing - multiprocessing.set_start_method('fork', force=True) - -# If build isolation is not in use and setuptools_scm is installed, -# then its file_finders entry point is invoked, which we don't need. -# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 -try: - import setuptools_scm.integration - setuptools_scm.integration.find_files = lambda _: [] -except ImportError: - pass - -# PEP 517 builds do not have . in sys.path -import sys -sys.path.insert(0, os.path.dirname(__file__)) - -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False - -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook - - from sage_setup.setenv import setenv - setenv() - - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () - - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - from sage_setup.command.sage_build_py import sage_build_py - sage_build_cython.built_distributions = ['sagemath-mcqd'] - - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext, - build_py=sage_build_py) - -from sage_setup.find import find_python_sources -python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-mcqd']) - -log.warn('python_packages = {0}'.format(python_packages)) -log.warn('python_modules = {0}'.format(python_modules)) -log.warn('cython_modules = {0}'.format(cython_modules)) - -setup( - cmdclass = cmdclass, - packages = python_packages, - py_modules = python_modules, - ext_modules = cython_modules, -) diff --git a/pkgs/sagemath-meataxe/MANIFEST.in b/pkgs/sagemath-meataxe/MANIFEST.in deleted file mode 100644 index c69ce68fc40..00000000000 --- a/pkgs/sagemath-meataxe/MANIFEST.in +++ /dev/null @@ -1,21 +0,0 @@ -prune sage - -include VERSION.txt - -include sage/libs/meataxe.p* -include sage/matrix/matrix_gfpn_dense.p* - -global-exclude *.c -global-exclude *.cpp - -global-exclude all__sagemath_*.* -global-include all__sagemath_meataxe.py - -global-exclude __pycache__ -global-exclude *.py[co] -global-exclude *.bak -global-exclude *.so -global-exclude *~ -prune .tox -prune build -prune dist diff --git a/pkgs/sagemath-meataxe/README.rst b/pkgs/sagemath-meataxe/README.rst deleted file mode 100644 index 69c03deee6f..00000000000 --- a/pkgs/sagemath-meataxe/README.rst +++ /dev/null @@ -1,33 +0,0 @@ -======================================================================================== - Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe -======================================================================================== - -About SageMath --------------- - - "Creating a Viable Open Source Alternative to - Magma, Maple, Mathematica, and MATLAB" - - Copyright (C) 2005-2024 The Sage Development Team - - https://www.sagemath.org - -SageMath fully supports all major Linux distributions, recent versions of -macOS, and Windows (Windows Subsystem for Linux). - -See https://doc.sagemath.org/html/en/installation/index.html -for general installation instructions. - - -About this pip-installable source distribution ----------------------------------------------- - -This pip-installable source distribution ``sagemath-meataxe`` is a small -optional distribution for use with ``sagemath-standard``. - -This distribution provides the SageMath modules ``sage.libs.meataxe`` -and ``sage.matrix.matrix_gfpn_dense``. - -It provides a specialized implementation of matrices over the finite field F_q, where -q <= 255, using the `SharedMeatAxe ` -library. diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt deleted file mode 100644 index c1c2af9c3a4..00000000000 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.8.beta8 diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 deleted file mode 100644 index fdbcd55424f..00000000000 --- a/pkgs/sagemath-meataxe/pyproject.toml.m4 +++ /dev/null @@ -1,38 +0,0 @@ -include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- -[build-system] -# Minimum requirements for the build system to execute. -requires = [ - SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment - SPKG_INSTALL_REQUIRES_sagemath_objects - SPKG_INSTALL_REQUIRES_cython - SPKG_INSTALL_REQUIRES_cysignals - SPKG_INSTALL_REQUIRES_pkgconfig -] -build-backend = "setuptools.build_meta" - -[project] -name = "sagemath-meataxe" -description = "Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe" -dependencies = [] -dynamic = ["version"] -include(`pyproject_toml_metadata.m4')dnl' - -[project.readme] -file = "README.rst" -content-type = "text/x-rst" - -[tool.setuptools] -packages = [ - "sage.libs", - "sage.matrix", -] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} - -[tool.setuptools.package-data] -"sage.libs" = ["meataxe.pxd"] -"sage.matrix" = ["matrix_gfpn_dense.pxd"] diff --git a/pkgs/sagemath-meataxe/requirements.txt.m4 b/pkgs/sagemath-meataxe/requirements.txt.m4 deleted file mode 100644 index 8b6ca03b0b9..00000000000 --- a/pkgs/sagemath-meataxe/requirements.txt.m4 +++ /dev/null @@ -1,2 +0,0 @@ -Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') -sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-meataxe/sage b/pkgs/sagemath-meataxe/sage deleted file mode 120000 index e0da5daa6f2..00000000000 --- a/pkgs/sagemath-meataxe/sage +++ /dev/null @@ -1 +0,0 @@ -../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-meataxe/setup.py b/pkgs/sagemath-meataxe/setup.py deleted file mode 100644 index f8e3f30ea9b..00000000000 --- a/pkgs/sagemath-meataxe/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python - -from distutils import log -from setuptools import setup - -# Work around a Cython problem in Python 3.8.x on macOS -# https://github.com/cython/cython/issues/3262 -import os -if os.uname().sysname == 'Darwin': - import multiprocessing - multiprocessing.set_start_method('fork', force=True) - -# If build isolation is not in use and setuptools_scm is installed, -# then its file_finders entry point is invoked, which we don't need. -# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 -try: - import setuptools_scm.integration - setuptools_scm.integration.find_files = lambda _: [] -except ImportError: - pass - -# PEP 517 builds do not have . in sys.path -import sys -sys.path.insert(0, os.path.dirname(__file__)) - -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False - -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook - - from sage_setup.setenv import setenv - setenv() - - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () - - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - from sage_setup.command.sage_build_py import sage_build_py - sage_build_cython.built_distributions = ['sagemath-meataxe'] - - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext, - build_py=sage_build_py) - -from sage_setup.find import find_python_sources -python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-meataxe']) - -log.warn('python_packages = {0}'.format(python_packages)) -log.warn('python_modules = {0}'.format(python_modules)) -log.warn('cython_modules = {0}'.format(cython_modules)) - -setup( - cmdclass = cmdclass, - packages = python_packages, - py_modules = python_modules, - ext_modules = cython_modules, -) diff --git a/pkgs/sagemath-sirocco/MANIFEST.in b/pkgs/sagemath-sirocco/MANIFEST.in deleted file mode 100644 index 8ac89baa796..00000000000 --- a/pkgs/sagemath-sirocco/MANIFEST.in +++ /dev/null @@ -1,20 +0,0 @@ -prune sage - -include VERSION.txt - -include sage/libs/sirocco.p* - -global-exclude *.c -global-exclude *.cpp - -global-exclude all__sagemath_*.* -global-include all__sagemath_sirocco.py - -global-exclude __pycache__ -global-exclude *.py[co] -global-exclude *.bak -global-exclude *.so -global-exclude *~ -prune .tox -prune build -prune dist diff --git a/pkgs/sagemath-sirocco/README.rst b/pkgs/sagemath-sirocco/README.rst deleted file mode 100644 index 31d70482784..00000000000 --- a/pkgs/sagemath-sirocco/README.rst +++ /dev/null @@ -1,29 +0,0 @@ -================================================================================== - Sage: Open Source Mathematics Software: Certified root continuation with sirocco -================================================================================== - -About SageMath --------------- - - "Creating a Viable Open Source Alternative to - Magma, Maple, Mathematica, and MATLAB" - - Copyright (C) 2005-2024 The Sage Development Team - - https://www.sagemath.org - -SageMath fully supports all major Linux distributions, recent versions of -macOS, and Windows (Windows Subsystem for Linux). - -See https://doc.sagemath.org/html/en/installation/index.html -for general installation instructions. - - -About this pip-installable source distribution ----------------------------------------------- - -This pip-installable source distribution ``sagemath-sirocco`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``sirocco`` library for the purpose -of compute topologically certified root continuation of bivariate polynomials. diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt deleted file mode 100644 index c1c2af9c3a4..00000000000 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.8.beta8 diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 deleted file mode 100644 index 6f2874254ab..00000000000 --- a/pkgs/sagemath-sirocco/pyproject.toml.m4 +++ /dev/null @@ -1,33 +0,0 @@ -include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- -[build-system] -# Minimum requirements for the build system to execute. -requires = [ - SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment - SPKG_INSTALL_REQUIRES_cython - SPKG_INSTALL_REQUIRES_cypari - SPKG_INSTALL_REQUIRES_cysignals - SPKG_INSTALL_REQUIRES_pkgconfig -] -build-backend = "setuptools.build_meta" - -[project] -name = "sagemath-sirocco" -description = "Sage: Open Source Mathematics Software: Certified root continuation with sirocco" -dependencies = [ - SPKG_INSTALL_REQUIRES_cypari - SPKG_INSTALL_REQUIRES_cysignals -] -dynamic = ["version"] -include(`pyproject_toml_metadata.m4')dnl' - -[project.readme] -file = "README.rst" -content-type = "text/x-rst" - -[tool.setuptools] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} diff --git a/pkgs/sagemath-sirocco/requirements.txt.m4 b/pkgs/sagemath-sirocco/requirements.txt.m4 deleted file mode 100644 index 8b6ca03b0b9..00000000000 --- a/pkgs/sagemath-sirocco/requirements.txt.m4 +++ /dev/null @@ -1,2 +0,0 @@ -Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') -sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-sirocco/sage b/pkgs/sagemath-sirocco/sage deleted file mode 120000 index e0da5daa6f2..00000000000 --- a/pkgs/sagemath-sirocco/sage +++ /dev/null @@ -1 +0,0 @@ -../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-sirocco/setup.py b/pkgs/sagemath-sirocco/setup.py deleted file mode 100644 index 9d82bfebcd8..00000000000 --- a/pkgs/sagemath-sirocco/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python - -from distutils import log -from setuptools import setup - -# Work around a Cython problem in Python 3.8.x on macOS -# https://github.com/cython/cython/issues/3262 -import os -if os.uname().sysname == 'Darwin': - import multiprocessing - multiprocessing.set_start_method('fork', force=True) - -# If build isolation is not in use and setuptools_scm is installed, -# then its file_finders entry point is invoked, which we don't need. -# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 -try: - import setuptools_scm.integration - setuptools_scm.integration.find_files = lambda _: [] -except ImportError: - pass - -# PEP 517 builds do not have . in sys.path -import sys -sys.path.insert(0, os.path.dirname(__file__)) - -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False - -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook - - from sage_setup.setenv import setenv - setenv() - - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () - - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - from sage_setup.command.sage_build_py import sage_build_py - sage_build_cython.built_distributions = ['sagemath-sirocco'] - - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext, - build_py=sage_build_py) - -from sage_setup.find import find_python_sources -python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-sirocco']) - -log.warn('python_packages = {0}'.format(python_packages)) -log.warn('python_modules = {0}'.format(python_modules)) -log.warn('cython_modules = {0}'.format(cython_modules)) - -setup( - cmdclass = cmdclass, - packages = python_packages, - py_modules = python_modules, - ext_modules = cython_modules, -) diff --git a/pkgs/sagemath-tdlib/MANIFEST.in b/pkgs/sagemath-tdlib/MANIFEST.in deleted file mode 100644 index 156e1c3b85a..00000000000 --- a/pkgs/sagemath-tdlib/MANIFEST.in +++ /dev/null @@ -1,21 +0,0 @@ -prune sage - -include VERSION.txt - -global-exclude *.c -global-exclude *.cpp - -include sage/graphs/graph_decompositions/sage_tdlib.cpp -include sage/graphs/graph_decompositions/tdlib.p* - -global-exclude all__sagemath_*.* -global-include all__sagemath_tdlib.py - -global-exclude __pycache__ -global-exclude *.py[co] -global-exclude *.bak -global-exclude *.so -global-exclude *~ -prune .tox -prune build -prune dist diff --git a/pkgs/sagemath-tdlib/README.rst b/pkgs/sagemath-tdlib/README.rst deleted file mode 100644 index 2f7d210e52f..00000000000 --- a/pkgs/sagemath-tdlib/README.rst +++ /dev/null @@ -1,29 +0,0 @@ -======================================================================== - Sage: Open Source Mathematics Software: Tree decompositions with tdlib -======================================================================== - -About SageMath --------------- - - "Creating a Viable Open Source Alternative to - Magma, Maple, Mathematica, and MATLAB" - - Copyright (C) 2005-2024 The Sage Development Team - - https://www.sagemath.org - -SageMath fully supports all major Linux distributions, recent versions of -macOS, and Windows (Windows Subsystem for Linux). - -See https://doc.sagemath.org/html/en/installation/index.html -for general installation instructions. - - -About this pip-installable source distribution ----------------------------------------------- - -This pip-installable source distribution ``sagemath-tdlib`` is a small -optional distribution for use with ``sagemath-standard``. - -It provides a Cython interface to the ``tdlib`` library, providing -algorithms concerning tree decompositions. diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt deleted file mode 100644 index c1c2af9c3a4..00000000000 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.8.beta8 diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 deleted file mode 100644 index d3efaf52cc1..00000000000 --- a/pkgs/sagemath-tdlib/pyproject.toml.m4 +++ /dev/null @@ -1,31 +0,0 @@ -include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- -[build-system] -# Minimum requirements for the build system to execute. -requires = [ - SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment - SPKG_INSTALL_REQUIRES_cython - SPKG_INSTALL_REQUIRES_cysignals - SPKG_INSTALL_REQUIRES_pkgconfig -] -build-backend = "setuptools.build_meta" - -[project] -name = "sagemath-tdlib" -description = "Sage: Open Source Mathematics Software: Tree decompositions with tdlib" -dependencies = [ - SPKG_INSTALL_REQUIRES_cysignals -] -dynamic = ["version"] -include(`pyproject_toml_metadata.m4')dnl' - -[project.readme] -file = "README.rst" -content-type = "text/x-rst" - -[tool.setuptools] -include-package-data = false - -[tool.setuptools.dynamic] -version = {file = ["VERSION.txt"]} diff --git a/pkgs/sagemath-tdlib/requirements.txt.m4 b/pkgs/sagemath-tdlib/requirements.txt.m4 deleted file mode 100644 index 8b6ca03b0b9..00000000000 --- a/pkgs/sagemath-tdlib/requirements.txt.m4 +++ /dev/null @@ -1,2 +0,0 @@ -Cython==esyscmd(`printf $(sed "s/[.]p.*//;" ../cython/package-version.txt)') -sagemath-standard==esyscmd(`printf $(sed "s/[.]p.*//;" ../sagelib/package-version.txt)') diff --git a/pkgs/sagemath-tdlib/sage b/pkgs/sagemath-tdlib/sage deleted file mode 120000 index e0da5daa6f2..00000000000 --- a/pkgs/sagemath-tdlib/sage +++ /dev/null @@ -1 +0,0 @@ -../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-tdlib/setup.py b/pkgs/sagemath-tdlib/setup.py deleted file mode 100644 index 0d6e1c1db28..00000000000 --- a/pkgs/sagemath-tdlib/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env python - -from distutils import log -from setuptools import setup - -# Work around a Cython problem in Python 3.8.x on macOS -# https://github.com/cython/cython/issues/3262 -import os -if os.uname().sysname == 'Darwin': - import multiprocessing - multiprocessing.set_start_method('fork', force=True) - -# If build isolation is not in use and setuptools_scm is installed, -# then its file_finders entry point is invoked, which we don't need. -# Workaround from ​https://github.com/pypa/setuptools_scm/issues/190#issuecomment-351181286 -try: - import setuptools_scm.integration - setuptools_scm.integration.find_files = lambda _: [] -except ImportError: - pass - -# PEP 517 builds do not have . in sys.path -import sys -sys.path.insert(0, os.path.dirname(__file__)) - -if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"): - sdist = True -else: - sdist = False - -if sdist: - cmdclass = {} -else: - from sage_setup.excepthook import excepthook - sys.excepthook = excepthook - - from sage_setup.setenv import setenv - setenv() - - import sage.env - sage.env.default_required_modules = sage.env.default_optional_modules = () - - from sage_setup.command.sage_build_cython import sage_build_cython - from sage_setup.command.sage_build_ext import sage_build_ext - from sage_setup.command.sage_build_py import sage_build_py - sage_build_cython.built_distributions = ['sagemath-tdlib'] - - cmdclass = dict(build_cython=sage_build_cython, - build_ext=sage_build_ext, - build_py=sage_build_py) - -from sage_setup.find import find_python_sources -python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-tdlib']) - -log.warn('python_packages = {0}'.format(python_packages)) -log.warn('python_modules = {0}'.format(python_modules)) -log.warn('cython_modules = {0}'.format(cython_modules)) - -setup( - cmdclass = cmdclass, - packages = python_packages, - py_modules = python_modules, - ext_modules = cython_modules, -) diff --git a/src/sage/features/bliss.py b/src/sage/features/bliss.py index 84269bd5189..f14893b5a89 100644 --- a/src/sage/features/bliss.py +++ b/src/sage/features/bliss.py @@ -76,7 +76,7 @@ def __init__(self): Feature('bliss') """ JoinFeature.__init__(self, "bliss", - [PythonModule("sage.graphs.bliss", spkg='sagemath_bliss', + [PythonModule("sage.graphs.bliss", spkg='bliss', url='http://www.tcs.hut.fi/Software/bliss/')]) diff --git a/src/sage/features/coxeter3.py b/src/sage/features/coxeter3.py index e23cd41a79b..3fdc3c88e03 100644 --- a/src/sage/features/coxeter3.py +++ b/src/sage/features/coxeter3.py @@ -37,7 +37,7 @@ def __init__(self): """ JoinFeature.__init__(self, "coxeter3", [PythonModule("sage.libs.coxeter3.coxeter", - spkg='sagemath_coxeter3')]) + spkg='coxeter3')]) def all_features(): diff --git a/src/sage/features/mcqd.py b/src/sage/features/mcqd.py index 6682e75b24f..7f0df8eedda 100644 --- a/src/sage/features/mcqd.py +++ b/src/sage/features/mcqd.py @@ -37,7 +37,7 @@ def __init__(self): """ JoinFeature.__init__(self, 'mcqd', [PythonModule('sage.graphs.mcqd', - spkg='sagemath_mcqd')]) + spkg='mcqd')]) def all_features(): diff --git a/src/sage/features/meataxe.py b/src/sage/features/meataxe.py index 9f346fd1a59..3276b3cdba7 100644 --- a/src/sage/features/meataxe.py +++ b/src/sage/features/meataxe.py @@ -38,7 +38,7 @@ def __init__(self): """ JoinFeature.__init__(self, 'meataxe', [PythonModule('sage.matrix.matrix_gfpn_dense', - spkg='sagemath_meataxe')]) + spkg='meataxe')]) def all_features(): diff --git a/src/sage/features/sirocco.py b/src/sage/features/sirocco.py index 65f649190b1..727513f940f 100644 --- a/src/sage/features/sirocco.py +++ b/src/sage/features/sirocco.py @@ -37,7 +37,7 @@ def __init__(self): """ JoinFeature.__init__(self, "sirocco", [PythonModule("sage.libs.sirocco", - spkg='sagemath_sirocco')]) + spkg='sirocco')]) def all_features(): diff --git a/src/sage/features/tdlib.py b/src/sage/features/tdlib.py index d2762853400..b47f9d8db9d 100644 --- a/src/sage/features/tdlib.py +++ b/src/sage/features/tdlib.py @@ -30,7 +30,7 @@ def __init__(self): """ JoinFeature.__init__(self, 'tdlib', [PythonModule('sage.graphs.graph_decompositions.tdlib', - spkg='sagemath_tdlib')]) + spkg='tdlib')]) def all_features(): diff --git a/src/sage/graphs/graph_decompositions/meson.build b/src/sage/graphs/graph_decompositions/meson.build index 8aa1fd50274..e30b80fac1e 100644 --- a/src/sage/graphs/graph_decompositions/meson.build +++ b/src/sage/graphs/graph_decompositions/meson.build @@ -1,7 +1,8 @@ -tdlib = disabler() if cc.has_header('treedec/combinations.hpp', required: get_option('tdlib')) # tdlib is a header-only library tdlib = declare_dependency() +else + tdlib = disabler() endif # Cannot be found via pkg-config rw = cc.find_library('rw', required: get_option('rankwidth'), disabler: true) diff --git a/src/sage/graphs/graph_decompositions/tree_decomposition.pyx b/src/sage/graphs/graph_decompositions/tree_decomposition.pyx index 9a4c2ad33a9..fa4d0f9b7ad 100644 --- a/src/sage/graphs/graph_decompositions/tree_decomposition.pyx +++ b/src/sage/graphs/graph_decompositions/tree_decomposition.pyx @@ -452,7 +452,7 @@ def treewidth(g, k=None, kmin=None, certificate=False, algorithm=None, nice=Fals tree-decomposition itself - ``algorithm`` -- whether to use ``'sage'`` or ``'tdlib'`` (requires the - installation of the :ref:`spkg_sagemath_tdlib` package). The default behaviour is to use + installation of the :ref:`spkg_tdlib` package). The default behaviour is to use 'tdlib' if it is available, and Sage's own algorithm when it is not. - ``nice`` -- boolean (default: ``False``); whether or not to return the