From fea311845e09d82b3de6b121a78e666f0b9e6ec7 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 2 Jul 2025 13:52:21 +0200 Subject: [PATCH] Remove sagemath-sirocco package --- .gitignore | 3 - build/make/Makefile.in | 1 - build/pkgs/sagemath_sirocco/SPKG.rst | 1 - build/pkgs/sagemath_sirocco/bootstrap | 1 - build/pkgs/sagemath_sirocco/dependencies | 1 - build/pkgs/sagemath_sirocco/distros/conda.txt | 1 - .../pkgs/sagemath_sirocco/package-version.txt | 1 - build/pkgs/sagemath_sirocco/spkg-install.in | 1 - build/pkgs/sagemath_sirocco/spkg-src | 24 ------- build/pkgs/sagemath_sirocco/src | 1 - build/pkgs/sagemath_sirocco/type | 1 - .../sagemath_sirocco/version_requirements.txt | 2 - constraints_pkgs.txt | 1 - pkgs/sagemath-sirocco/MANIFEST.in | 20 ------ pkgs/sagemath-sirocco/README.rst | 29 --------- pkgs/sagemath-sirocco/VERSION.txt | 1 - pkgs/sagemath-sirocco/pyproject.toml.m4 | 33 ---------- pkgs/sagemath-sirocco/requirements.txt.m4 | 2 - pkgs/sagemath-sirocco/sage | 1 - pkgs/sagemath-sirocco/setup.py | 65 ------------------- src/MANIFEST.in | 1 - src/sage/all__sagemath_sirocco.py | 1 - src/sage/libs/all__sagemath_sirocco.py | 1 - src/sage/libs/meson.build | 1 - src/sage/libs/sirocco.pyx | 1 - src/sage/meson.build | 1 - src/sage/misc/package_dir.py | 8 +-- src/setup.cfg.m4 | 1 - 28 files changed, 3 insertions(+), 202 deletions(-) delete mode 120000 build/pkgs/sagemath_sirocco/SPKG.rst delete mode 120000 build/pkgs/sagemath_sirocco/bootstrap delete mode 100644 build/pkgs/sagemath_sirocco/dependencies delete mode 100644 build/pkgs/sagemath_sirocco/distros/conda.txt delete mode 120000 build/pkgs/sagemath_sirocco/package-version.txt delete mode 120000 build/pkgs/sagemath_sirocco/spkg-install.in delete mode 100755 build/pkgs/sagemath_sirocco/spkg-src delete mode 120000 build/pkgs/sagemath_sirocco/src delete mode 100644 build/pkgs/sagemath_sirocco/type delete mode 100644 build/pkgs/sagemath_sirocco/version_requirements.txt delete mode 100644 pkgs/sagemath-sirocco/MANIFEST.in delete mode 100644 pkgs/sagemath-sirocco/README.rst delete mode 100644 pkgs/sagemath-sirocco/VERSION.txt delete mode 100644 pkgs/sagemath-sirocco/pyproject.toml.m4 delete mode 100644 pkgs/sagemath-sirocco/requirements.txt.m4 delete mode 120000 pkgs/sagemath-sirocco/sage delete mode 100644 pkgs/sagemath-sirocco/setup.py delete mode 100644 src/sage/all__sagemath_sirocco.py delete mode 100644 src/sage/libs/all__sagemath_sirocco.py diff --git a/.gitignore b/.gitignore index 9533c36b731..33d9bc16ddb 100644 --- a/.gitignore +++ b/.gitignore @@ -221,7 +221,6 @@ build/pkgs/wheel/version_requirements.txt /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 @@ -231,7 +230,6 @@ build/pkgs/wheel/version_requirements.txt /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 @@ -241,7 +239,6 @@ build/pkgs/wheel/version_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 diff --git a/build/make/Makefile.in b/build/make/Makefile.in index b64a4ce9e7d..2e3dba470a6 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -145,7 +145,6 @@ PYPI_WHEEL_PACKAGES = $(PYPI_NOARCH_WHEEL_PACKAGES) \ sagemath_mcqd \ sagemath_tdlib \ sagemath_coxeter3 \ - sagemath_sirocco \ sagemath_meataxe # sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib 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 c4540217bba..00000000000 --- a/build/pkgs/sagemath_sirocco/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -src/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 7b8d3122d65..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.7b7 diff --git a/constraints_pkgs.txt b/constraints_pkgs.txt index 9e4fe969fbc..742ee8c6730 100644 --- a/constraints_pkgs.txt +++ b/constraints_pkgs.txt @@ -34,6 +34,5 @@ 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-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 6ff7c5976c0..00000000000 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -10.7.beta7 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/src/MANIFEST.in b/src/MANIFEST.in index 8428dfff314..d5465ce12e2 100644 --- a/src/MANIFEST.in +++ b/src/MANIFEST.in @@ -62,7 +62,6 @@ global-exclude all__sagemath_bliss.py global-exclude all__sagemath_coxeter3.py global-exclude all__sagemath_mcqd.py global-exclude all__sagemath_meataxe.py -global-exclude all__sagemath_sirocco.py global-exclude all__sagemath_tdlib.py global-exclude __pycache__ diff --git a/src/sage/all__sagemath_sirocco.py b/src/sage/all__sagemath_sirocco.py deleted file mode 100644 index 44db2511e89..00000000000 --- a/src/sage/all__sagemath_sirocco.py +++ /dev/null @@ -1 +0,0 @@ -# sage_setup: distribution = sagemath-sirocco diff --git a/src/sage/libs/all__sagemath_sirocco.py b/src/sage/libs/all__sagemath_sirocco.py deleted file mode 100644 index 44db2511e89..00000000000 --- a/src/sage/libs/all__sagemath_sirocco.py +++ /dev/null @@ -1 +0,0 @@ -# sage_setup: distribution = sagemath-sirocco diff --git a/src/sage/libs/meson.build b/src/sage/libs/meson.build index 2e786592728..e5eabc44aa9 100644 --- a/src/sage/libs/meson.build +++ b/src/sage/libs/meson.build @@ -33,7 +33,6 @@ py.install_sources( 'all__sagemath_coxeter3.py', 'all__sagemath_meataxe.py', 'all__sagemath_objects.py', - 'all__sagemath_sirocco.py', 'ecl.pxd', 'eclsig.h', 'gmpxx.pxd', diff --git a/src/sage/libs/sirocco.pyx b/src/sage/libs/sirocco.pyx index 7be4d96e7ac..c135d67ab5f 100644 --- a/src/sage/libs/sirocco.pyx +++ b/src/sage/libs/sirocco.pyx @@ -1,7 +1,6 @@ # cython: boundscheck=False, wraparound=False # distutils: libraries = sirocco # distutils: language = c++ -# sage_setup: distribution = sagemath-sirocco r""" Cython wrapper for sirocco library diff --git a/src/sage/meson.build b/src/sage/meson.build index 0b7633e0b64..17be9552e09 100644 --- a/src/sage/meson.build +++ b/src/sage/meson.build @@ -100,7 +100,6 @@ py.install_sources( 'all__sagemath_meataxe.py', 'all__sagemath_objects.py', 'all__sagemath_repl.py', - 'all__sagemath_sirocco.py', 'all__sagemath_tdlib.py', 'all_cmdline.py', 'env.py', diff --git a/src/sage/misc/package_dir.py b/src/sage/misc/package_dir.py index eb31477148d..ef91ae242b6 100644 --- a/src/sage/misc/package_dir.py +++ b/src/sage/misc/package_dir.py @@ -12,11 +12,10 @@ # https://www.gnu.org/licenses/ # **************************************************************************** -import os import glob +import os import re import sys - from collections import defaultdict from contextlib import contextmanager @@ -335,8 +334,8 @@ def cython_namespace_package_support(): See https://github.com/cython/cython/issues/2918#issuecomment-991799049 """ - import Cython.Build.Dependencies import Cython.Build.Cythonize + import Cython.Build.Dependencies import Cython.Utils orig_is_package_dir = Cython.Utils.is_package_dir Cython.Utils.is_package_dir = Cython.Build.Cythonize.is_package_dir = Cython.Build.Dependencies.is_package_dir = Cython.Utils.cached_function(is_package_or_sage_namespace_package_dir) @@ -386,7 +385,7 @@ def iter_modules(path=None, prefix=''): """ Yield :class:`ModuleInfo` for all submodules on ``path``. """ - from pkgutil import get_importer, iter_importers, ModuleInfo + from pkgutil import ModuleInfo, get_importer, iter_importers if path is None: importers = iter_importers() @@ -522,7 +521,6 @@ def _distribution_from_all_filename(filename): "sagemath-coxeter3", "sagemath-mcqd", "sagemath-meataxe", - "sagemath-sirocco", "sagemath-tdlib", "sagemath-environment", "sagemath-categories", diff --git a/src/setup.cfg.m4 b/src/setup.cfg.m4 index caec16fa51d..f2d12ff061d 100644 --- a/src/setup.cfg.m4 +++ b/src/setup.cfg.m4 @@ -131,5 +131,4 @@ bliss = SPKG_INSTALL_REQUIRES_sagemath_bliss coxeter3 = SPKG_INSTALL_REQUIRES_sagemath_coxeter3 mcqd = SPKG_INSTALL_REQUIRES_sagemath_mcqd meataxe = SPKG_INSTALL_REQUIRES_sagemath_meataxe -sirocco = SPKG_INSTALL_REQUIRES_sagemath_sirocco tdlib = SPKG_INSTALL_REQUIRES_sagemath_tdlib