From 5e9f41a88a8418212dc3ec031f76b47a57e54707 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 12 Aug 2022 18:46:42 -0700 Subject: [PATCH 01/42] build/pkgs/sagemath_sirocco: New --- build/pkgs/sagemath_sirocco/distros/conda.txt | 1 + build/pkgs/sagemath_sirocco/type | 1 + 2 files changed, 2 insertions(+) create mode 100644 build/pkgs/sagemath_sirocco/distros/conda.txt create mode 100644 build/pkgs/sagemath_sirocco/type diff --git a/build/pkgs/sagemath_sirocco/distros/conda.txt b/build/pkgs/sagemath_sirocco/distros/conda.txt new file mode 100644 index 00000000000..fc9cfb79706 --- /dev/null +++ b/build/pkgs/sagemath_sirocco/distros/conda.txt @@ -0,0 +1 @@ +sagemath-sirocco diff --git a/build/pkgs/sagemath_sirocco/type b/build/pkgs/sagemath_sirocco/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_sirocco/type @@ -0,0 +1 @@ +optional From 0fcb28d990457c1ee1177cd2f636740fa113534a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 8 Oct 2022 19:36:38 -0700 Subject: [PATCH 02/42] src/bin/sage-update-version: Distribution name of sagelib is sagemath-standard --- build/pkgs/sagelib/install-requires.txt | 2 +- src/bin/sage-update-version | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/install-requires.txt index 6b2c789e91c..9ef7caee2a2 100644 --- a/build/pkgs/sagelib/install-requires.txt +++ b/build/pkgs/sagelib/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagelib ~= 10.0 +sagemath-standard ~= 10.0 diff --git a/src/bin/sage-update-version b/src/bin/sage-update-version index 40df8926f74..a77715f3842 100755 --- a/src/bin/sage-update-version +++ b/src/bin/sage-update-version @@ -48,7 +48,11 @@ done if [ -f "$spkg"/install-requires.txt -a -d "$spkg"/src ]; then ( echo "# This file is updated on every release by the sage-update-version script" # Normalize the package name to PyPI convention (dashes, not underscores) - pkg=${spkg//_/-} + if [ "$spkg" = sagelib ]; then + pkg=sagemath-standard + else + pkg=${spkg//_/-} + fi # Normalize the version (updated above as VERSION.txt) according to PEP440. version=$(cat "$spkg"/package-version.txt) version=${version//.beta/b} From b357fc6520cc89accc20366ba068dfa20eb3b62d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 8 Oct 2022 18:56:41 -0700 Subject: [PATCH 03/42] build/pkgs/sagemath_bliss, pkgs/sagemath-bliss: New --- build/pkgs/sagemath_bliss/SPKG.rst | 1 + build/pkgs/sagemath_bliss/bootstrap | 1 + build/pkgs/sagemath_bliss/dependencies | 1 + build/pkgs/sagemath_bliss/distros/conda.txt | 1 + .../pkgs/sagemath_bliss/install-requires.txt | 2 + build/pkgs/sagemath_bliss/package-version.txt | 1 + build/pkgs/sagemath_bliss/spkg-install | 29 ++++++++ build/pkgs/sagemath_bliss/spkg-src | 21 ++++++ build/pkgs/sagemath_bliss/src | 1 + build/pkgs/sagemath_bliss/type | 1 + pkgs/sagemath-bliss/MANIFEST.in | 12 ++++ pkgs/sagemath-bliss/README.rst | 32 +++++++++ pkgs/sagemath-bliss/VERSION.txt | 1 + pkgs/sagemath-bliss/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-bliss/requirements.txt.m4 | 2 + pkgs/sagemath-bliss/sage | 1 + pkgs/sagemath-bliss/setup.cfg.m4 | 32 +++++++++ pkgs/sagemath-bliss/setup.py | 68 +++++++++++++++++++ 18 files changed, 221 insertions(+) create mode 120000 build/pkgs/sagemath_bliss/SPKG.rst create mode 120000 build/pkgs/sagemath_bliss/bootstrap create mode 100644 build/pkgs/sagemath_bliss/dependencies create mode 100644 build/pkgs/sagemath_bliss/distros/conda.txt create mode 100644 build/pkgs/sagemath_bliss/install-requires.txt create mode 120000 build/pkgs/sagemath_bliss/package-version.txt create mode 100755 build/pkgs/sagemath_bliss/spkg-install create mode 100755 build/pkgs/sagemath_bliss/spkg-src create mode 120000 build/pkgs/sagemath_bliss/src create mode 100644 build/pkgs/sagemath_bliss/type create mode 100644 pkgs/sagemath-bliss/MANIFEST.in create mode 100644 pkgs/sagemath-bliss/README.rst create mode 100644 pkgs/sagemath-bliss/VERSION.txt create mode 100644 pkgs/sagemath-bliss/pyproject.toml.m4 create mode 100644 pkgs/sagemath-bliss/requirements.txt.m4 create mode 120000 pkgs/sagemath-bliss/sage create mode 100644 pkgs/sagemath-bliss/setup.cfg.m4 create mode 100644 pkgs/sagemath-bliss/setup.py diff --git a/build/pkgs/sagemath_bliss/SPKG.rst b/build/pkgs/sagemath_bliss/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_bliss/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/bootstrap b/build/pkgs/sagemath_bliss/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_bliss/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies new file mode 100644 index 00000000000..88ac8461924 --- /dev/null +++ b/build/pkgs/sagemath_bliss/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib bliss | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_bliss/distros/conda.txt b/build/pkgs/sagemath_bliss/distros/conda.txt new file mode 100644 index 00000000000..d6139d966ec --- /dev/null +++ b/build/pkgs/sagemath_bliss/distros/conda.txt @@ -0,0 +1 @@ +sagemath-bliss diff --git a/build/pkgs/sagemath_bliss/install-requires.txt b/build/pkgs/sagemath_bliss/install-requires.txt new file mode 100644 index 00000000000..1a6df993169 --- /dev/null +++ b/build/pkgs/sagemath_bliss/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-bliss diff --git a/build/pkgs/sagemath_bliss/package-version.txt b/build/pkgs/sagemath_bliss/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_bliss/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/spkg-install b/build/pkgs/sagemath_bliss/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_bliss/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_bliss/spkg-src b/build/pkgs/sagemath_bliss/spkg-src new file mode 100755 index 00000000000..8825ba3d119 --- /dev/null +++ b/build/pkgs/sagemath_bliss/spkg-src @@ -0,0 +1,21 @@ +#!/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 +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_bliss/src b/build/pkgs/sagemath_bliss/src new file mode 120000 index 00000000000..51c70b82b95 --- /dev/null +++ b/build/pkgs/sagemath_bliss/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-bliss \ No newline at end of file diff --git a/build/pkgs/sagemath_bliss/type b/build/pkgs/sagemath_bliss/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_bliss/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in new file mode 100644 index 00000000000..9f780ae66a6 --- /dev/null +++ b/pkgs/sagemath-bliss/MANIFEST.in @@ -0,0 +1,12 @@ +prune sage +global-exclude *.c +global-exclude *.cpp + +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 new file mode 100644 index 00000000000..4ed83254c31 --- /dev/null +++ b/pkgs/sagemath-bliss/README.rst @@ -0,0 +1,32 @@ +============================================================================== + 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-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +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 new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-bliss/requirements.txt.m4 b/pkgs/sagemath-bliss/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-bliss/requirements.txt.m4 @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-bliss/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 new file mode 100644 index 00000000000..3ad6d2e12cd --- /dev/null +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -0,0 +1,32 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-bliss +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with bliss +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.11 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-bliss/setup.py b/pkgs/sagemath-bliss/setup.py new file mode 100644 index 00000000000..9c4bae94934 --- /dev/null +++ b/pkgs/sagemath-bliss/setup.py @@ -0,0 +1,68 @@ +#!/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 + sage_build_cython.built_distributions = ['sagemath-bliss'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + 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, +) From 76624762748fee1181723ca75bf3e90f8c35aafb Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 8 Oct 2022 22:24:59 -0700 Subject: [PATCH 04/42] build/pkgs/sagelib/spkg-install [--disable-editable --enable-wheels]: Do not handle sagemath-bliss --- build/pkgs/sagelib/spkg-install | 3 +++ pkgs/sagemath-standard/setup.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sagelib/spkg-install b/build/pkgs/sagelib/spkg-install index ed6bb969f31..6d0f523eef2 100755 --- a/build/pkgs/sagelib/spkg-install +++ b/build/pkgs/sagelib/spkg-install @@ -55,6 +55,8 @@ unset SAGE_PKG_CONFIG_PATH SITEPACKAGESDIR=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])') +export SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS="mcqd,tdlib,coxeter3,fes,sirocco,meataxe" + if [ "$SAGE_EDITABLE" = yes ]; then # In an incremental build, we may need to uninstall old versions installed by distutils # under the old distribution name "sage" (before #30912, which switched to setuptools @@ -79,6 +81,7 @@ else # Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd time sdh_pip_install --no-build-isolation . else + SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+=",bliss" time python3 -u setup.py --no-user-cfg build install || exit 1 fi fi diff --git a/pkgs/sagemath-standard/setup.py b/pkgs/sagemath-standard/setup.py index 975f89b5905..7f6318a0fa0 100755 --- a/pkgs/sagemath-standard/setup.py +++ b/pkgs/sagemath-standard/setup.py @@ -76,15 +76,14 @@ # TODO: This should be quiet by default print("Discovering Python/Cython source code....") t = time.time() -distributions = [''] from sage.misc.package import is_package_installed_and_updated -optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', - 'coxeter3', 'sirocco', 'meataxe'] +distributions = [''] +optional_packages_with_extensions = os.environ.get('SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS', '').split(',') distributions += ['sagemath-{}'.format(pkg) for pkg in optional_packages_with_extensions if is_package_installed_and_updated(pkg)] log.warn('distributions = {0}'.format(distributions)) -from sage_setup.find import find_python_sources, find_extra_files +from sage_setup.find import find_python_sources python_packages, python_modules, cython_modules = find_python_sources( SAGE_SRC, ['sage'], distributions=distributions) From b353acaa288fdef8e25aedc39307a7e196da2e6a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 9 Oct 2022 00:40:23 -0700 Subject: [PATCH 05/42] pkgs/sagemath-bliss/MANIFEST.in: Fixup --- pkgs/sagemath-bliss/MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in index 9f780ae66a6..8534471f1f2 100644 --- a/pkgs/sagemath-bliss/MANIFEST.in +++ b/pkgs/sagemath-bliss/MANIFEST.in @@ -1,4 +1,3 @@ -prune sage global-exclude *.c global-exclude *.cpp From cb72b96c283e65982f09b436638802fb89b7032d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 22:08:46 -0800 Subject: [PATCH 06/42] pkgs/sagemath-standard/MANIFEST.in: Exclude sage/graphs/bliss.pyx --- src/MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/MANIFEST.in b/src/MANIFEST.in index 1e7df6e529b..0f6e2a37890 100644 --- a/src/MANIFEST.in +++ b/src/MANIFEST.in @@ -44,6 +44,9 @@ include sage/geometry/triangulation/triangulations.cc include sage/geometry/triangulation/data.cc include sage/geometry/triangulation/functions.cc +# Exclude extension modules shipped by optional packages +exclude sage/graphs/bliss.pyx + global-exclude __pycache__ global-exclude *.py[co] global-exclude *.bak From 565ed2a2bbc9d29a6b966859531ad7b595b056d4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 22:53:01 -0800 Subject: [PATCH 07/42] pkgs/sagemath-bliss/setup.cfg.m4: Allow python 3.11 --- pkgs/sagemath-bliss/setup.cfg.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 index 3ad6d2e12cd..098b0a36e42 100644 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -21,11 +21,12 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Programming Language :: Python :: Implementation :: CPython Topic :: Scientific/Engineering :: Mathematics [options] -python_requires = >=3.8, <3.11 +python_requires = >=3.8, <3.12 install_requires = esyscmd(`sage-get-system-packages install-requires \ sagelib \ From 5fffc6e30cb1c9c5d83a7c51f80dcc04949480ec Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 23:02:11 -0800 Subject: [PATCH 08/42] build/pkgs/sagemath_sirocco, pkgs/sagemath-sirocco: New --- build/pkgs/sagemath_sirocco/SPKG.rst | 1 + build/pkgs/sagemath_sirocco/bootstrap | 1 + build/pkgs/sagemath_sirocco/dependencies | 1 + .../sagemath_sirocco/install-requires.txt | 2 + .../pkgs/sagemath_sirocco/package-version.txt | 1 + build/pkgs/sagemath_sirocco/spkg-install | 29 ++++++++ build/pkgs/sagemath_sirocco/spkg-src | 21 ++++++ build/pkgs/sagemath_sirocco/src | 1 + pkgs/sagemath-sirocco/MANIFEST.in | 11 +++ pkgs/sagemath-sirocco/README.rst | 32 +++++++++ pkgs/sagemath-sirocco/VERSION.txt | 1 + pkgs/sagemath-sirocco/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-sirocco/requirements.txt.m4 | 2 + pkgs/sagemath-sirocco/sage | 1 + pkgs/sagemath-sirocco/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-sirocco/setup.py | 68 +++++++++++++++++++ 16 files changed, 219 insertions(+) create mode 120000 build/pkgs/sagemath_sirocco/SPKG.rst create mode 120000 build/pkgs/sagemath_sirocco/bootstrap create mode 100644 build/pkgs/sagemath_sirocco/dependencies create mode 100644 build/pkgs/sagemath_sirocco/install-requires.txt create mode 120000 build/pkgs/sagemath_sirocco/package-version.txt create mode 100755 build/pkgs/sagemath_sirocco/spkg-install create mode 100755 build/pkgs/sagemath_sirocco/spkg-src create mode 120000 build/pkgs/sagemath_sirocco/src create mode 100644 pkgs/sagemath-sirocco/MANIFEST.in create mode 100644 pkgs/sagemath-sirocco/README.rst create mode 100644 pkgs/sagemath-sirocco/VERSION.txt create mode 100644 pkgs/sagemath-sirocco/pyproject.toml.m4 create mode 100644 pkgs/sagemath-sirocco/requirements.txt.m4 create mode 120000 pkgs/sagemath-sirocco/sage create mode 100644 pkgs/sagemath-sirocco/setup.cfg.m4 create mode 100644 pkgs/sagemath-sirocco/setup.py diff --git a/build/pkgs/sagemath_sirocco/SPKG.rst b/build/pkgs/sagemath_sirocco/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_sirocco/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/bootstrap b/build/pkgs/sagemath_sirocco/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_sirocco/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies new file mode 100644 index 00000000000..b1c36d924fe --- /dev/null +++ b/build/pkgs/sagemath_sirocco/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib sirocco | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_sirocco/install-requires.txt b/build/pkgs/sagemath_sirocco/install-requires.txt new file mode 100644 index 00000000000..27206229424 --- /dev/null +++ b/build/pkgs/sagemath_sirocco/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-sirocco diff --git a/build/pkgs/sagemath_sirocco/package-version.txt b/build/pkgs/sagemath_sirocco/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_sirocco/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_sirocco/spkg-install b/build/pkgs/sagemath_sirocco/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_sirocco/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_sirocco/spkg-src b/build/pkgs/sagemath_sirocco/spkg-src new file mode 100755 index 00000000000..50007016d9f --- /dev/null +++ b/build/pkgs/sagemath_sirocco/spkg-src @@ -0,0 +1,21 @@ +#!/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 +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_sirocco/src b/build/pkgs/sagemath_sirocco/src new file mode 120000 index 00000000000..03d0d674991 --- /dev/null +++ b/build/pkgs/sagemath_sirocco/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-sirocco \ No newline at end of file diff --git a/pkgs/sagemath-sirocco/MANIFEST.in b/pkgs/sagemath-sirocco/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-sirocco/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +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 new file mode 100644 index 00000000000..683ef82e4b5 --- /dev/null +++ b/pkgs/sagemath-sirocco/README.rst @@ -0,0 +1,32 @@ +================================================================================== + 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-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +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 new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-sirocco/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-sirocco/requirements.txt.m4 b/pkgs/sagemath-sirocco/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-sirocco/requirements.txt.m4 @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-sirocco/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-sirocco/setup.cfg.m4 b/pkgs/sagemath-sirocco/setup.cfg.m4 new file mode 100644 index 00000000000..80f5fec8380 --- /dev/null +++ b/pkgs/sagemath-sirocco/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-sirocco +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Certified root continuation with sirocco +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-sirocco/setup.py b/pkgs/sagemath-sirocco/setup.py new file mode 100644 index 00000000000..97f8cfba091 --- /dev/null +++ b/pkgs/sagemath-sirocco/setup.py @@ -0,0 +1,68 @@ +#!/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 + sage_build_cython.built_distributions = ['sagemath-sirocco'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + 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, +) From 907bc16af59e3d02d87024c71d13862808369bfd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 23:03:46 -0800 Subject: [PATCH 09/42] build/pkgs/sagemath_mcqd, pkgs/sagemath-mcqd: New --- build/pkgs/sagemath_mcqd/SPKG.rst | 1 + build/pkgs/sagemath_mcqd/bootstrap | 1 + build/pkgs/sagemath_mcqd/dependencies | 1 + build/pkgs/sagemath_mcqd/distros/conda.txt | 1 + build/pkgs/sagemath_mcqd/install-requires.txt | 2 + build/pkgs/sagemath_mcqd/package-version.txt | 1 + build/pkgs/sagemath_mcqd/spkg-install | 29 ++++++++ build/pkgs/sagemath_mcqd/spkg-src | 21 ++++++ build/pkgs/sagemath_mcqd/src | 1 + build/pkgs/sagemath_mcqd/type | 1 + pkgs/sagemath-mcqd/MANIFEST.in | 11 +++ pkgs/sagemath-mcqd/README.rst | 32 +++++++++ pkgs/sagemath-mcqd/VERSION.txt | 1 + pkgs/sagemath-mcqd/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-mcqd/requirements.txt.m4 | 2 + pkgs/sagemath-mcqd/sage | 1 + pkgs/sagemath-mcqd/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-mcqd/setup.py | 68 +++++++++++++++++++ 18 files changed, 221 insertions(+) create mode 120000 build/pkgs/sagemath_mcqd/SPKG.rst create mode 120000 build/pkgs/sagemath_mcqd/bootstrap create mode 100644 build/pkgs/sagemath_mcqd/dependencies create mode 100644 build/pkgs/sagemath_mcqd/distros/conda.txt create mode 100644 build/pkgs/sagemath_mcqd/install-requires.txt create mode 120000 build/pkgs/sagemath_mcqd/package-version.txt create mode 100755 build/pkgs/sagemath_mcqd/spkg-install create mode 100755 build/pkgs/sagemath_mcqd/spkg-src create mode 120000 build/pkgs/sagemath_mcqd/src create mode 100644 build/pkgs/sagemath_mcqd/type create mode 100644 pkgs/sagemath-mcqd/MANIFEST.in create mode 100644 pkgs/sagemath-mcqd/README.rst create mode 100644 pkgs/sagemath-mcqd/VERSION.txt create mode 100644 pkgs/sagemath-mcqd/pyproject.toml.m4 create mode 100644 pkgs/sagemath-mcqd/requirements.txt.m4 create mode 120000 pkgs/sagemath-mcqd/sage create mode 100644 pkgs/sagemath-mcqd/setup.cfg.m4 create mode 100644 pkgs/sagemath-mcqd/setup.py diff --git a/build/pkgs/sagemath_mcqd/SPKG.rst b/build/pkgs/sagemath_mcqd/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/bootstrap b/build/pkgs/sagemath_mcqd/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_mcqd/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies new file mode 100644 index 00000000000..9d0b4667b19 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib mcqd | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_mcqd/distros/conda.txt b/build/pkgs/sagemath_mcqd/distros/conda.txt new file mode 100644 index 00000000000..9504f7f4c76 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/distros/conda.txt @@ -0,0 +1 @@ +sagemath-mcqd diff --git a/build/pkgs/sagemath_mcqd/install-requires.txt b/build/pkgs/sagemath_mcqd/install-requires.txt new file mode 100644 index 00000000000..fe12cd47385 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-mcqd diff --git a/build/pkgs/sagemath_mcqd/package-version.txt b/build/pkgs/sagemath_mcqd/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_mcqd/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/spkg-install b/build/pkgs/sagemath_mcqd/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_mcqd/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_mcqd/spkg-src b/build/pkgs/sagemath_mcqd/spkg-src new file mode 100755 index 00000000000..74315e28641 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/spkg-src @@ -0,0 +1,21 @@ +#!/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 +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_mcqd/src b/build/pkgs/sagemath_mcqd/src new file mode 120000 index 00000000000..03d68b8cbe3 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-mcqd \ No newline at end of file diff --git a/build/pkgs/sagemath_mcqd/type b/build/pkgs/sagemath_mcqd/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_mcqd/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-mcqd/MANIFEST.in b/pkgs/sagemath-mcqd/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-mcqd/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +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 new file mode 100644 index 00000000000..f3ac1a4fa2a --- /dev/null +++ b/pkgs/sagemath-mcqd/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with mcqd +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +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 for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-mcqd/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-mcqd/requirements.txt.m4 b/pkgs/sagemath-mcqd/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-mcqd/requirements.txt.m4 @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-mcqd/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 new file mode 100644 index 00000000000..9007469c4b9 --- /dev/null +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-mcqd +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with mcqd +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-mcqd/setup.py b/pkgs/sagemath-mcqd/setup.py new file mode 100644 index 00000000000..6b4850ef7b7 --- /dev/null +++ b/pkgs/sagemath-mcqd/setup.py @@ -0,0 +1,68 @@ +#!/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 + sage_build_cython.built_distributions = ['sagemath-mcqd'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + 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, +) From 90063b66c5daeb1c6a03d0e6a44d5bbdfb973218 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 23:05:44 -0800 Subject: [PATCH 10/42] build/pkgs/sagemath_tdlib, pkgs/sagemath-tdlib: New --- build/pkgs/sagemath_tdlib/SPKG.rst | 1 + build/pkgs/sagemath_tdlib/bootstrap | 1 + build/pkgs/sagemath_tdlib/dependencies | 1 + build/pkgs/sagemath_tdlib/distros/conda.txt | 1 + .../pkgs/sagemath_tdlib/install-requires.txt | 2 + build/pkgs/sagemath_tdlib/package-version.txt | 1 + build/pkgs/sagemath_tdlib/spkg-install | 29 ++++++++ build/pkgs/sagemath_tdlib/spkg-src | 21 ++++++ build/pkgs/sagemath_tdlib/src | 1 + build/pkgs/sagemath_tdlib/type | 1 + pkgs/sagemath-tdlib/MANIFEST.in | 11 +++ pkgs/sagemath-tdlib/README.rst | 32 +++++++++ pkgs/sagemath-tdlib/VERSION.txt | 1 + pkgs/sagemath-tdlib/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-tdlib/requirements.txt.m4 | 2 + pkgs/sagemath-tdlib/sage | 1 + pkgs/sagemath-tdlib/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-tdlib/setup.py | 68 +++++++++++++++++++ 18 files changed, 221 insertions(+) create mode 120000 build/pkgs/sagemath_tdlib/SPKG.rst create mode 120000 build/pkgs/sagemath_tdlib/bootstrap create mode 100644 build/pkgs/sagemath_tdlib/dependencies create mode 100644 build/pkgs/sagemath_tdlib/distros/conda.txt create mode 100644 build/pkgs/sagemath_tdlib/install-requires.txt create mode 120000 build/pkgs/sagemath_tdlib/package-version.txt create mode 100755 build/pkgs/sagemath_tdlib/spkg-install create mode 100755 build/pkgs/sagemath_tdlib/spkg-src create mode 120000 build/pkgs/sagemath_tdlib/src create mode 100644 build/pkgs/sagemath_tdlib/type create mode 100644 pkgs/sagemath-tdlib/MANIFEST.in create mode 100644 pkgs/sagemath-tdlib/README.rst create mode 100644 pkgs/sagemath-tdlib/VERSION.txt create mode 100644 pkgs/sagemath-tdlib/pyproject.toml.m4 create mode 100644 pkgs/sagemath-tdlib/requirements.txt.m4 create mode 120000 pkgs/sagemath-tdlib/sage create mode 100644 pkgs/sagemath-tdlib/setup.cfg.m4 create mode 100644 pkgs/sagemath-tdlib/setup.py diff --git a/build/pkgs/sagemath_tdlib/SPKG.rst b/build/pkgs/sagemath_tdlib/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_tdlib/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/bootstrap b/build/pkgs/sagemath_tdlib/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_tdlib/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies new file mode 100644 index 00000000000..455f0b4067f --- /dev/null +++ b/build/pkgs/sagemath_tdlib/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib tdlib | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_tdlib/distros/conda.txt b/build/pkgs/sagemath_tdlib/distros/conda.txt new file mode 100644 index 00000000000..f890d1c9084 --- /dev/null +++ b/build/pkgs/sagemath_tdlib/distros/conda.txt @@ -0,0 +1 @@ +sagemath-tdlib diff --git a/build/pkgs/sagemath_tdlib/install-requires.txt b/build/pkgs/sagemath_tdlib/install-requires.txt new file mode 100644 index 00000000000..3c9b6aeb39e --- /dev/null +++ b/build/pkgs/sagemath_tdlib/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-tdlib diff --git a/build/pkgs/sagemath_tdlib/package-version.txt b/build/pkgs/sagemath_tdlib/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_tdlib/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/spkg-install b/build/pkgs/sagemath_tdlib/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_tdlib/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_tdlib/spkg-src b/build/pkgs/sagemath_tdlib/spkg-src new file mode 100755 index 00000000000..057d119a259 --- /dev/null +++ b/build/pkgs/sagemath_tdlib/spkg-src @@ -0,0 +1,21 @@ +#!/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 +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_tdlib/src b/build/pkgs/sagemath_tdlib/src new file mode 120000 index 00000000000..0d238df793e --- /dev/null +++ b/build/pkgs/sagemath_tdlib/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-tdlib \ No newline at end of file diff --git a/build/pkgs/sagemath_tdlib/type b/build/pkgs/sagemath_tdlib/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_tdlib/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-tdlib/MANIFEST.in b/pkgs/sagemath-tdlib/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-tdlib/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +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 new file mode 100644 index 00000000000..47b1acc5ce6 --- /dev/null +++ b/pkgs/sagemath-tdlib/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with tdlib +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +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 for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-tdlib/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-tdlib/requirements.txt.m4 b/pkgs/sagemath-tdlib/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-tdlib/requirements.txt.m4 @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-tdlib/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 new file mode 100644 index 00000000000..c8ddc1ea631 --- /dev/null +++ b/pkgs/sagemath-tdlib/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-tdlib +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with tdlib +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-tdlib/setup.py b/pkgs/sagemath-tdlib/setup.py new file mode 100644 index 00000000000..e9f63206386 --- /dev/null +++ b/pkgs/sagemath-tdlib/setup.py @@ -0,0 +1,68 @@ +#!/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 + sage_build_cython.built_distributions = ['sagemath-tdlib'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + 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, +) From 6ac56294ecb115f6da69485c1b89d40fa9b34013 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 23:07:38 -0800 Subject: [PATCH 11/42] build/pkgs/sagemath_coxeter3, pkgs/sagemath-coxeter3: New --- build/pkgs/sagemath_coxeter3/SPKG.rst | 1 + build/pkgs/sagemath_coxeter3/bootstrap | 1 + build/pkgs/sagemath_coxeter3/dependencies | 1 + .../pkgs/sagemath_coxeter3/distros/conda.txt | 1 + .../sagemath_coxeter3/install-requires.txt | 2 + .../sagemath_coxeter3/package-version.txt | 1 + build/pkgs/sagemath_coxeter3/spkg-install | 29 ++++++++ build/pkgs/sagemath_coxeter3/spkg-src | 21 ++++++ build/pkgs/sagemath_coxeter3/src | 1 + build/pkgs/sagemath_coxeter3/type | 1 + pkgs/sagemath-coxeter3/MANIFEST.in | 11 +++ pkgs/sagemath-coxeter3/README.rst | 32 +++++++++ pkgs/sagemath-coxeter3/VERSION.txt | 1 + pkgs/sagemath-coxeter3/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-coxeter3/requirements.txt.m4 | 2 + pkgs/sagemath-coxeter3/sage | 1 + pkgs/sagemath-coxeter3/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-coxeter3/setup.py | 68 +++++++++++++++++++ 18 files changed, 221 insertions(+) create mode 120000 build/pkgs/sagemath_coxeter3/SPKG.rst create mode 120000 build/pkgs/sagemath_coxeter3/bootstrap create mode 100644 build/pkgs/sagemath_coxeter3/dependencies create mode 100644 build/pkgs/sagemath_coxeter3/distros/conda.txt create mode 100644 build/pkgs/sagemath_coxeter3/install-requires.txt create mode 120000 build/pkgs/sagemath_coxeter3/package-version.txt create mode 100755 build/pkgs/sagemath_coxeter3/spkg-install create mode 100755 build/pkgs/sagemath_coxeter3/spkg-src create mode 120000 build/pkgs/sagemath_coxeter3/src create mode 100644 build/pkgs/sagemath_coxeter3/type create mode 100644 pkgs/sagemath-coxeter3/MANIFEST.in create mode 100644 pkgs/sagemath-coxeter3/README.rst create mode 100644 pkgs/sagemath-coxeter3/VERSION.txt create mode 100644 pkgs/sagemath-coxeter3/pyproject.toml.m4 create mode 100644 pkgs/sagemath-coxeter3/requirements.txt.m4 create mode 120000 pkgs/sagemath-coxeter3/sage create mode 100644 pkgs/sagemath-coxeter3/setup.cfg.m4 create mode 100644 pkgs/sagemath-coxeter3/setup.py diff --git a/build/pkgs/sagemath_coxeter3/SPKG.rst b/build/pkgs/sagemath_coxeter3/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/bootstrap b/build/pkgs/sagemath_coxeter3/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies new file mode 100644 index 00000000000..55f26dde8e1 --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_coxeter3/distros/conda.txt b/build/pkgs/sagemath_coxeter3/distros/conda.txt new file mode 100644 index 00000000000..3ffe2eb8bfc --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/distros/conda.txt @@ -0,0 +1 @@ +sagemath-coxeter3 diff --git a/build/pkgs/sagemath_coxeter3/install-requires.txt b/build/pkgs/sagemath_coxeter3/install-requires.txt new file mode 100644 index 00000000000..52e4f34c240 --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-coxeter3 diff --git a/build/pkgs/sagemath_coxeter3/package-version.txt b/build/pkgs/sagemath_coxeter3/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/spkg-install b/build/pkgs/sagemath_coxeter3/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_coxeter3/spkg-src b/build/pkgs/sagemath_coxeter3/spkg-src new file mode 100755 index 00000000000..8ae44f00fec --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/spkg-src @@ -0,0 +1,21 @@ +#!/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 +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_coxeter3/src b/build/pkgs/sagemath_coxeter3/src new file mode 120000 index 00000000000..a9a1c8ae443 --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-coxeter3 \ No newline at end of file diff --git a/build/pkgs/sagemath_coxeter3/type b/build/pkgs/sagemath_coxeter3/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_coxeter3/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-coxeter3/MANIFEST.in b/pkgs/sagemath-coxeter3/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-coxeter3/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +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 new file mode 100644 index 00000000000..fbc6e64938a --- /dev/null +++ b/pkgs/sagemath-coxeter3/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with coxeter3 +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +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 for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-coxeter3/requirements.txt.m4 b/pkgs/sagemath-coxeter3/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-coxeter3/requirements.txt.m4 @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-coxeter3/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 new file mode 100644 index 00000000000..aad6b620681 --- /dev/null +++ b/pkgs/sagemath-coxeter3/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-coxeter3 +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with coxeter3 +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-coxeter3/setup.py b/pkgs/sagemath-coxeter3/setup.py new file mode 100644 index 00000000000..639b1124e8a --- /dev/null +++ b/pkgs/sagemath-coxeter3/setup.py @@ -0,0 +1,68 @@ +#!/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 + sage_build_cython.built_distributions = ['sagemath-coxeter3'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + 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, +) From 39062b222795c886d3985c6ad2b9ab8def781e19 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 23:11:38 -0800 Subject: [PATCH 12/42] build/pkgs/sagemath_meataxe, pkgs/sagemath-meataxe: New --- build/pkgs/sagemath_meataxe/SPKG.rst | 1 + build/pkgs/sagemath_meataxe/bootstrap | 1 + build/pkgs/sagemath_meataxe/dependencies | 1 + build/pkgs/sagemath_meataxe/distros/conda.txt | 1 + .../sagemath_meataxe/install-requires.txt | 2 + .../pkgs/sagemath_meataxe/package-version.txt | 1 + build/pkgs/sagemath_meataxe/spkg-install | 29 ++++++++ build/pkgs/sagemath_meataxe/spkg-src | 21 ++++++ build/pkgs/sagemath_meataxe/src | 1 + build/pkgs/sagemath_meataxe/type | 1 + pkgs/sagemath-meataxe/MANIFEST.in | 11 +++ pkgs/sagemath-meataxe/README.rst | 32 +++++++++ pkgs/sagemath-meataxe/VERSION.txt | 1 + pkgs/sagemath-meataxe/pyproject.toml.m4 | 14 ++++ pkgs/sagemath-meataxe/requirements.txt.m4 | 2 + pkgs/sagemath-meataxe/sage | 1 + pkgs/sagemath-meataxe/setup.cfg.m4 | 33 +++++++++ pkgs/sagemath-meataxe/setup.py | 68 +++++++++++++++++++ 18 files changed, 221 insertions(+) create mode 120000 build/pkgs/sagemath_meataxe/SPKG.rst create mode 120000 build/pkgs/sagemath_meataxe/bootstrap create mode 100644 build/pkgs/sagemath_meataxe/dependencies create mode 100644 build/pkgs/sagemath_meataxe/distros/conda.txt create mode 100644 build/pkgs/sagemath_meataxe/install-requires.txt create mode 120000 build/pkgs/sagemath_meataxe/package-version.txt create mode 100755 build/pkgs/sagemath_meataxe/spkg-install create mode 100755 build/pkgs/sagemath_meataxe/spkg-src create mode 120000 build/pkgs/sagemath_meataxe/src create mode 100644 build/pkgs/sagemath_meataxe/type create mode 100644 pkgs/sagemath-meataxe/MANIFEST.in create mode 100644 pkgs/sagemath-meataxe/README.rst create mode 100644 pkgs/sagemath-meataxe/VERSION.txt create mode 100644 pkgs/sagemath-meataxe/pyproject.toml.m4 create mode 100644 pkgs/sagemath-meataxe/requirements.txt.m4 create mode 120000 pkgs/sagemath-meataxe/sage create mode 100644 pkgs/sagemath-meataxe/setup.cfg.m4 create mode 100644 pkgs/sagemath-meataxe/setup.py diff --git a/build/pkgs/sagemath_meataxe/SPKG.rst b/build/pkgs/sagemath_meataxe/SPKG.rst new file mode 120000 index 00000000000..b4545b4bda6 --- /dev/null +++ b/build/pkgs/sagemath_meataxe/SPKG.rst @@ -0,0 +1 @@ +src/README.rst \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/bootstrap b/build/pkgs/sagemath_meataxe/bootstrap new file mode 120000 index 00000000000..40542346a4e --- /dev/null +++ b/build/pkgs/sagemath_meataxe/bootstrap @@ -0,0 +1 @@ +../sagelib/bootstrap \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies new file mode 100644 index 00000000000..c1f2d173d62 --- /dev/null +++ b/build/pkgs/sagemath_meataxe/dependencies @@ -0,0 +1 @@ +$(PYTHON) sagelib meataxe | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_meataxe/distros/conda.txt b/build/pkgs/sagemath_meataxe/distros/conda.txt new file mode 100644 index 00000000000..b3abc7692fe --- /dev/null +++ b/build/pkgs/sagemath_meataxe/distros/conda.txt @@ -0,0 +1 @@ +sagemath-meataxe diff --git a/build/pkgs/sagemath_meataxe/install-requires.txt b/build/pkgs/sagemath_meataxe/install-requires.txt new file mode 100644 index 00000000000..11efcbb715e --- /dev/null +++ b/build/pkgs/sagemath_meataxe/install-requires.txt @@ -0,0 +1,2 @@ +# This file is updated on every release by the sage-update-version script +sagemath-meataxe diff --git a/build/pkgs/sagemath_meataxe/package-version.txt b/build/pkgs/sagemath_meataxe/package-version.txt new file mode 120000 index 00000000000..c4540217bba --- /dev/null +++ b/build/pkgs/sagemath_meataxe/package-version.txt @@ -0,0 +1 @@ +src/VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/spkg-install b/build/pkgs/sagemath_meataxe/spkg-install new file mode 100755 index 00000000000..7ce202f09ae --- /dev/null +++ b/build/pkgs/sagemath_meataxe/spkg-install @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# From sage-spkg. +# For type=script packages, the build rule in build/make/Makefile sources +# sage-env but not sage-dist-helpers. +lib="$SAGE_ROOT/build/bin/sage-dist-helpers" +source "$lib" +if [ $? -ne 0 ]; then + echo >&2 "Error: failed to source $lib" + echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?" + exit 1 +fi +cd src + +export PIP_NO_INDEX=true +export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS" + +if [ "$SAGE_EDITABLE" = yes ]; then + # SAGE_ROOT/src/setup.py installs everything, nothing to do... + if [ "$SAGE_WHEELS" = yes ]; then + # ... except we build the wheel if requested + sdh_setup_bdist_wheel && sdh_store_wheel . + fi +else + if [ "$SAGE_WHEELS" = yes ]; then + # Modularized install via wheels + sdh_pip_install . + # else nothing to do in legacy direct installation. + fi +fi diff --git a/build/pkgs/sagemath_meataxe/spkg-src b/build/pkgs/sagemath_meataxe/spkg-src new file mode 100755 index 00000000000..a2e3d071d9e --- /dev/null +++ b/build/pkgs/sagemath_meataxe/spkg-src @@ -0,0 +1,21 @@ +#!/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 +python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" diff --git a/build/pkgs/sagemath_meataxe/src b/build/pkgs/sagemath_meataxe/src new file mode 120000 index 00000000000..1164dd787fd --- /dev/null +++ b/build/pkgs/sagemath_meataxe/src @@ -0,0 +1 @@ +../../../pkgs/sagemath-meataxe \ No newline at end of file diff --git a/build/pkgs/sagemath_meataxe/type b/build/pkgs/sagemath_meataxe/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/sagemath_meataxe/type @@ -0,0 +1 @@ +optional diff --git a/pkgs/sagemath-meataxe/MANIFEST.in b/pkgs/sagemath-meataxe/MANIFEST.in new file mode 100644 index 00000000000..8534471f1f2 --- /dev/null +++ b/pkgs/sagemath-meataxe/MANIFEST.in @@ -0,0 +1,11 @@ +global-exclude *.c +global-exclude *.cpp + +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 new file mode 100644 index 00000000000..546034e5f6b --- /dev/null +++ b/pkgs/sagemath-meataxe/README.rst @@ -0,0 +1,32 @@ +============================================================================== + Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with meataxe +============================================================================== + +About SageMath +-------------- + + "Creating a Viable Open Source Alternative to + Magma, Maple, Mathematica, and MATLAB" + + Copyright (C) 2005-2022 The Sage Development Team + + https://www.sagemath.org + +SageMath fully supports all major Linux distributions, recent versions of +macOS, and Windows (using Cygwin or Windows Subsystem for Linux). + +The traditional and recommended way to install SageMath is from source via +Sage-the-distribution (https://www.sagemath.org/download-source.html). +Sage-the-distribution first builds a large number of open source packages from +source (unless it finds suitable versions installed in the system) and then +installs the Sage Library (sagelib, implemented in Python and Cython). + + +About this pip-installable source distribution +---------------------------------------------- + +This pip-installable source distribution ``sagemath-meataxe`` is a small +optional distribution for use with ``sagemath-standard``. + +It provides a Cython interface to the ``meataxe`` library for the purpose +of computing graph (iso/auto)morphisms. diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt new file mode 100644 index 00000000000..737bfe2c1d2 --- /dev/null +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -0,0 +1 @@ +9.8.beta1 diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 new file mode 100644 index 00000000000..aa4c23992be --- /dev/null +++ b/pkgs/sagemath-meataxe/pyproject.toml.m4 @@ -0,0 +1,14 @@ +[build-system] +# Minimum requirements for the build system to execute. +requires = [ + esyscmd(`sage-get-system-packages install-requires-toml \ + setuptools \ + wheel \ + sage_setup \ + sagemath_environment \ + sagemath_standard \ + cython \ + gmpy2 \ + cysignals \ + ')] +build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-meataxe/requirements.txt.m4 b/pkgs/sagemath-meataxe/requirements.txt.m4 new file mode 100644 index 00000000000..8b6ca03b0b9 --- /dev/null +++ b/pkgs/sagemath-meataxe/requirements.txt.m4 @@ -0,0 +1,2 @@ +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 new file mode 120000 index 00000000000..e0da5daa6f2 --- /dev/null +++ b/pkgs/sagemath-meataxe/sage @@ -0,0 +1 @@ +../../src/sage \ No newline at end of file diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 new file mode 100644 index 00000000000..f22941464d5 --- /dev/null +++ b/pkgs/sagemath-meataxe/setup.cfg.m4 @@ -0,0 +1,33 @@ +# -*- conf-unix -*- +[metadata] +name = sagemath-meataxe +version = file: VERSION.txt +description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with meataxe +long_description = file: README.rst +long_description_content_type = text/x-rst +license = GNU General Public License (GPL) v2 or later +author = The Sage Developers +author_email = sage-support@googlegroups.com +url = https://www.sagemath.org + +classifiers = + Development Status :: 6 - Mature + Intended Audience :: Education + Intended Audience :: Science/Research + License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) + Operating System :: POSIX + Operating System :: MacOS :: MacOS X + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: Implementation :: CPython + Topic :: Scientific/Engineering :: Mathematics + +[options] +python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + sagelib \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-meataxe/setup.py b/pkgs/sagemath-meataxe/setup.py new file mode 100644 index 00000000000..e59e1caa046 --- /dev/null +++ b/pkgs/sagemath-meataxe/setup.py @@ -0,0 +1,68 @@ +#!/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 + sage_build_cython.built_distributions = ['sagemath-meataxe'] + + cmdclass = dict(build_cython=sage_build_cython, + build_ext=sage_build_ext) + +if sdist: + python_packages = [] + python_modules = [] + cython_modules = [] +else: + 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, +) From 49566e8850cf3646307b59581155121f3c784784 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 15 Nov 2022 23:19:49 -0800 Subject: [PATCH 13/42] Makefile, build/pkgs/sagelib/spkg-install: Add remaining optional packages with extensions --- build/pkgs/sagelib/spkg-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pkgs/sagelib/spkg-install b/build/pkgs/sagelib/spkg-install index 6d0f523eef2..dd1ddab1fc8 100755 --- a/build/pkgs/sagelib/spkg-install +++ b/build/pkgs/sagelib/spkg-install @@ -55,7 +55,7 @@ unset SAGE_PKG_CONFIG_PATH SITEPACKAGESDIR=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])') -export SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS="mcqd,tdlib,coxeter3,fes,sirocco,meataxe" +export SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS="" if [ "$SAGE_EDITABLE" = yes ]; then # In an incremental build, we may need to uninstall old versions installed by distutils @@ -81,7 +81,7 @@ else # Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd time sdh_pip_install --no-build-isolation . else - SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+=",bliss" + SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+="mcqd,tdlib,coxeter3,fes,sirocco,meataxe,bliss" time python3 -u setup.py --no-user-cfg build install || exit 1 fi fi From 14c65ac51cf146c1553b97d0ad9425a6e03cbd9e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 00:04:22 -0800 Subject: [PATCH 14/42] Update SPKG.rst --- pkgs/sagemath-coxeter3/README.rst | 9 ++++----- pkgs/sagemath-mcqd/README.rst | 11 ++++++----- pkgs/sagemath-meataxe/README.rst | 14 +++++++++----- pkgs/sagemath-tdlib/README.rst | 10 +++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/sagemath-coxeter3/README.rst b/pkgs/sagemath-coxeter3/README.rst index fbc6e64938a..fd213cf4f81 100644 --- a/pkgs/sagemath-coxeter3/README.rst +++ b/pkgs/sagemath-coxeter3/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with coxeter3 -============================================================================== +==================================================================================================================== + Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3 +==================================================================================================================== About SageMath -------------- @@ -28,5 +28,4 @@ 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 for the purpose -of computing graph (iso/auto)morphisms. +It provides a Cython interface to the ``coxeter3`` library. diff --git a/pkgs/sagemath-mcqd/README.rst b/pkgs/sagemath-mcqd/README.rst index f3ac1a4fa2a..c1f6c2d1d6a 100644 --- a/pkgs/sagemath-mcqd/README.rst +++ b/pkgs/sagemath-mcqd/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with mcqd -============================================================================== +=========================================================================== + Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd +=========================================================================== About SageMath -------------- @@ -28,5 +28,6 @@ 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 for the purpose -of computing graph (iso/auto)morphisms. +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-meataxe/README.rst b/pkgs/sagemath-meataxe/README.rst index 546034e5f6b..2432aedcbbc 100644 --- a/pkgs/sagemath-meataxe/README.rst +++ b/pkgs/sagemath-meataxe/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with meataxe -============================================================================== +======================================================================================== + Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe +======================================================================================== About SageMath -------------- @@ -28,5 +28,9 @@ About this pip-installable source distribution This pip-installable source distribution ``sagemath-meataxe`` is a small optional distribution for use with ``sagemath-standard``. -It provides a Cython interface to the ``meataxe`` library for the purpose -of computing graph (iso/auto)morphisms. +This distribution provides the SageMath modules :mod:`sage.libs.meataxe` +and :mod:`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-tdlib/README.rst b/pkgs/sagemath-tdlib/README.rst index 47b1acc5ce6..8c061242f74 100644 --- a/pkgs/sagemath-tdlib/README.rst +++ b/pkgs/sagemath-tdlib/README.rst @@ -1,6 +1,6 @@ -============================================================================== - Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with tdlib -============================================================================== +======================================================================== + Sage: Open Source Mathematics Software: Tree decompositions with tdlib +======================================================================== About SageMath -------------- @@ -28,5 +28,5 @@ 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 for the purpose -of computing graph (iso/auto)morphisms. +It provides a Cython interface to the ``tdlib`` library, providing +algorithms concerning tree decompositions. From 6a4b47e2da6db11378485c497d7045cea8018d66 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 20 Nov 2022 23:49:54 -0800 Subject: [PATCH 15/42] pkgs/sagemath-meataxe/README.rst: Fix rst syntax --- pkgs/sagemath-meataxe/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/sagemath-meataxe/README.rst b/pkgs/sagemath-meataxe/README.rst index 2432aedcbbc..e3169f70c8d 100644 --- a/pkgs/sagemath-meataxe/README.rst +++ b/pkgs/sagemath-meataxe/README.rst @@ -28,8 +28,8 @@ 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 :mod:`sage.libs.meataxe` -and :mod:`sage.matrix.matrix_gfpn_dense`. +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 ` From dd70495bd03fdf5d4b7ead91129997f37677dad4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 7 Dec 2022 20:27:20 -0800 Subject: [PATCH 16/42] pkgs/sagemath-tdlib/MANIFEST.in: Add VERSION.txt --- pkgs/sagemath-tdlib/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/sagemath-tdlib/MANIFEST.in b/pkgs/sagemath-tdlib/MANIFEST.in index 8534471f1f2..62ab4f26d05 100644 --- a/pkgs/sagemath-tdlib/MANIFEST.in +++ b/pkgs/sagemath-tdlib/MANIFEST.in @@ -1,3 +1,5 @@ +include VERSION.txt + global-exclude *.c global-exclude *.cpp From 96a1d465487937bbdd2cc04b2d5ae6b07a754a3b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 18 Dec 2022 21:49:19 -0800 Subject: [PATCH 17/42] build/pkgs/sagemath*/spkg-src: Use build --- build/pkgs/sagemath_bliss/spkg-src | 5 ++++- build/pkgs/sagemath_coxeter3/spkg-src | 5 ++++- build/pkgs/sagemath_mcqd/spkg-src | 5 ++++- build/pkgs/sagemath_meataxe/spkg-src | 5 ++++- build/pkgs/sagemath_sirocco/spkg-src | 5 ++++- build/pkgs/sagemath_tdlib/spkg-src | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/build/pkgs/sagemath_bliss/spkg-src b/build/pkgs/sagemath_bliss/spkg-src index 8825ba3d119..483b2f349e3 100755 --- a/build/pkgs/sagemath_bliss/spkg-src +++ b/build/pkgs/sagemath_bliss/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_bliss cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# 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/spkg-src b/build/pkgs/sagemath_coxeter3/spkg-src index 8ae44f00fec..df635f450cf 100755 --- a/build/pkgs/sagemath_coxeter3/spkg-src +++ b/build/pkgs/sagemath_coxeter3/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_coxeter3 cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# 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/spkg-src b/build/pkgs/sagemath_mcqd/spkg-src index 74315e28641..c1602f0953e 100755 --- a/build/pkgs/sagemath_mcqd/spkg-src +++ b/build/pkgs/sagemath_mcqd/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_mcqd cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# 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/spkg-src b/build/pkgs/sagemath_meataxe/spkg-src index a2e3d071d9e..a0e05c1fc98 100755 --- a/build/pkgs/sagemath_meataxe/spkg-src +++ b/build/pkgs/sagemath_meataxe/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_meataxe cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# 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/spkg-src b/build/pkgs/sagemath_sirocco/spkg-src index 50007016d9f..4082abf43b2 100755 --- a/build/pkgs/sagemath_sirocco/spkg-src +++ b/build/pkgs/sagemath_sirocco/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_sirocco cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# 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/spkg-src b/build/pkgs/sagemath_tdlib/spkg-src index 057d119a259..88e67414c05 100755 --- a/build/pkgs/sagemath_tdlib/spkg-src +++ b/build/pkgs/sagemath_tdlib/spkg-src @@ -18,4 +18,7 @@ set -e cd build/pkgs/sagemath_tdlib cd src -python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" +# Get rid of old *.egg-info/SOURCES.txt +rm -Rf *.egg-info + +python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" From 2bb69b7164098c9f3c3783f975cac38eaf58d89a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 12:29:00 -0700 Subject: [PATCH 18/42] README.md, pkgs/*/README.rst: Update copyright years --- README.md | 2 +- pkgs/sagemath-bliss/README.rst | 2 +- pkgs/sagemath-categories/README.rst | 2 +- pkgs/sagemath-coxeter3/README.rst | 2 +- pkgs/sagemath-environment/README.rst | 2 +- pkgs/sagemath-mcqd/README.rst | 2 +- pkgs/sagemath-meataxe/README.rst | 2 +- pkgs/sagemath-objects/README.rst | 2 +- pkgs/sagemath-repl/README.rst | 2 +- pkgs/sagemath-sirocco/README.rst | 2 +- pkgs/sagemath-tdlib/README.rst | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f086349a015..9982460cd78 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ > "Creating a Viable Open Source Alternative to > Magma, Maple, Mathematica, and MATLAB" -> Copyright (C) 2005-2022 The Sage Development Team +> Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-bliss/README.rst b/pkgs/sagemath-bliss/README.rst index 4ed83254c31..9e1cb2e826f 100644 --- a/pkgs/sagemath-bliss/README.rst +++ b/pkgs/sagemath-bliss/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-categories/README.rst b/pkgs/sagemath-categories/README.rst index d1f90fea966..55cddc3c95c 100644 --- a/pkgs/sagemath-categories/README.rst +++ b/pkgs/sagemath-categories/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-coxeter3/README.rst b/pkgs/sagemath-coxeter3/README.rst index fd213cf4f81..8b605bda499 100644 --- a/pkgs/sagemath-coxeter3/README.rst +++ b/pkgs/sagemath-coxeter3/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-environment/README.rst b/pkgs/sagemath-environment/README.rst index ba5905777c0..eaeb4078fed 100644 --- a/pkgs/sagemath-environment/README.rst +++ b/pkgs/sagemath-environment/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-mcqd/README.rst b/pkgs/sagemath-mcqd/README.rst index c1f6c2d1d6a..00ef5f8ea3e 100644 --- a/pkgs/sagemath-mcqd/README.rst +++ b/pkgs/sagemath-mcqd/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-meataxe/README.rst b/pkgs/sagemath-meataxe/README.rst index e3169f70c8d..659edb3cf9f 100644 --- a/pkgs/sagemath-meataxe/README.rst +++ b/pkgs/sagemath-meataxe/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-objects/README.rst b/pkgs/sagemath-objects/README.rst index 9dc9cfd888f..4426d8683a3 100644 --- a/pkgs/sagemath-objects/README.rst +++ b/pkgs/sagemath-objects/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-repl/README.rst b/pkgs/sagemath-repl/README.rst index 3dde4aae5e5..90b73be3cf5 100644 --- a/pkgs/sagemath-repl/README.rst +++ b/pkgs/sagemath-repl/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-sirocco/README.rst b/pkgs/sagemath-sirocco/README.rst index 683ef82e4b5..0207d63b9a5 100644 --- a/pkgs/sagemath-sirocco/README.rst +++ b/pkgs/sagemath-sirocco/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org diff --git a/pkgs/sagemath-tdlib/README.rst b/pkgs/sagemath-tdlib/README.rst index 8c061242f74..0c91ddcf1c6 100644 --- a/pkgs/sagemath-tdlib/README.rst +++ b/pkgs/sagemath-tdlib/README.rst @@ -8,7 +8,7 @@ About SageMath "Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, and MATLAB" - Copyright (C) 2005-2022 The Sage Development Team + Copyright (C) 2005-2023 The Sage Development Team https://www.sagemath.org From 3ede4310b5e963bc1d3beee016cf8a02c5bdf444 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 12:38:39 -0700 Subject: [PATCH 19/42] pkgs: Update versions --- build/pkgs/sagemath_bliss/install-requires.txt | 2 +- build/pkgs/sagemath_coxeter3/install-requires.txt | 2 +- build/pkgs/sagemath_mcqd/install-requires.txt | 2 +- build/pkgs/sagemath_meataxe/install-requires.txt | 2 +- build/pkgs/sagemath_sirocco/install-requires.txt | 2 +- build/pkgs/sagemath_tdlib/install-requires.txt | 2 +- pkgs/sagemath-bliss/VERSION.txt | 2 +- pkgs/sagemath-coxeter3/VERSION.txt | 2 +- pkgs/sagemath-mcqd/VERSION.txt | 2 +- pkgs/sagemath-meataxe/VERSION.txt | 2 +- pkgs/sagemath-sirocco/VERSION.txt | 2 +- pkgs/sagemath-tdlib/VERSION.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/pkgs/sagemath_bliss/install-requires.txt b/build/pkgs/sagemath_bliss/install-requires.txt index 1a6df993169..63b4f674b7a 100644 --- a/build/pkgs/sagemath_bliss/install-requires.txt +++ b/build/pkgs/sagemath_bliss/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-bliss +sagemath-bliss ~= 10.0 diff --git a/build/pkgs/sagemath_coxeter3/install-requires.txt b/build/pkgs/sagemath_coxeter3/install-requires.txt index 52e4f34c240..5b13d4be973 100644 --- a/build/pkgs/sagemath_coxeter3/install-requires.txt +++ b/build/pkgs/sagemath_coxeter3/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-coxeter3 +sagemath-coxeter3 ~= 10.0 diff --git a/build/pkgs/sagemath_mcqd/install-requires.txt b/build/pkgs/sagemath_mcqd/install-requires.txt index fe12cd47385..fed6656d3ef 100644 --- a/build/pkgs/sagemath_mcqd/install-requires.txt +++ b/build/pkgs/sagemath_mcqd/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-mcqd +sagemath-mcqd ~= 10.0 diff --git a/build/pkgs/sagemath_meataxe/install-requires.txt b/build/pkgs/sagemath_meataxe/install-requires.txt index 11efcbb715e..9c920e5c5c3 100644 --- a/build/pkgs/sagemath_meataxe/install-requires.txt +++ b/build/pkgs/sagemath_meataxe/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-meataxe +sagemath-meataxe ~= 10.0 diff --git a/build/pkgs/sagemath_sirocco/install-requires.txt b/build/pkgs/sagemath_sirocco/install-requires.txt index 27206229424..df1048f36be 100644 --- a/build/pkgs/sagemath_sirocco/install-requires.txt +++ b/build/pkgs/sagemath_sirocco/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-sirocco +sagemath-sirocco ~= 10.0 diff --git a/build/pkgs/sagemath_tdlib/install-requires.txt b/build/pkgs/sagemath_tdlib/install-requires.txt index 3c9b6aeb39e..8e813aef43a 100644 --- a/build/pkgs/sagemath_tdlib/install-requires.txt +++ b/build/pkgs/sagemath_tdlib/install-requires.txt @@ -1,2 +1,2 @@ # This file is updated on every release by the sage-update-version script -sagemath-tdlib +sagemath-tdlib ~= 10.0 diff --git a/pkgs/sagemath-bliss/VERSION.txt b/pkgs/sagemath-bliss/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-bliss/VERSION.txt +++ b/pkgs/sagemath-bliss/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-coxeter3/VERSION.txt b/pkgs/sagemath-coxeter3/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-coxeter3/VERSION.txt +++ b/pkgs/sagemath-coxeter3/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-mcqd/VERSION.txt b/pkgs/sagemath-mcqd/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-mcqd/VERSION.txt +++ b/pkgs/sagemath-mcqd/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-meataxe/VERSION.txt b/pkgs/sagemath-meataxe/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-meataxe/VERSION.txt +++ b/pkgs/sagemath-meataxe/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-sirocco/VERSION.txt b/pkgs/sagemath-sirocco/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-sirocco/VERSION.txt +++ b/pkgs/sagemath-sirocco/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 diff --git a/pkgs/sagemath-tdlib/VERSION.txt b/pkgs/sagemath-tdlib/VERSION.txt index 737bfe2c1d2..2f52450b31d 100644 --- a/pkgs/sagemath-tdlib/VERSION.txt +++ b/pkgs/sagemath-tdlib/VERSION.txt @@ -1 +1 @@ -9.8.beta1 +10.0 From 51c27d0ee510dad142e7050d9420efd6e6e46935 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 12:50:52 -0700 Subject: [PATCH 20/42] build/make/Makefile.in (PYPI_WHEEL_PACKAGES): Add the new packages --- build/make/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/make/Makefile.in b/build/make/Makefile.in index 370d436bb2c..b6858173362 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -135,7 +135,13 @@ PYPI_WHEEL_PACKAGES = \ sagemath_environment \ sagemath_objects \ sagemath_repl \ - sagemath_categories + sagemath_categories \ + 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) \ From 7dfc9255fd2c26545087aa713512bb926a901639 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 13:03:29 -0700 Subject: [PATCH 21/42] Add all__sagemath_{bliss,mcqd,...}.py files --- pkgs/sagemath-bliss/MANIFEST.in | 2 ++ pkgs/sagemath-coxeter3/MANIFEST.in | 2 ++ pkgs/sagemath-mcqd/MANIFEST.in | 2 ++ pkgs/sagemath-meataxe/MANIFEST.in | 2 ++ pkgs/sagemath-sirocco/MANIFEST.in | 2 ++ pkgs/sagemath-tdlib/MANIFEST.in | 2 ++ src/sage/all__sagemath_bliss.py | 0 src/sage/all__sagemath_coxeter3.py | 0 src/sage/all__sagemath_mcqd.py | 0 src/sage/all__sagemath_meataxe.py | 0 src/sage/all__sagemath_sirocco.py | 0 src/sage/all__sagemath_tdlib.py | 0 src/sage/graphs/all__sagemath_bliss.py | 0 src/sage/graphs/all__sagemath_mcqd.py | 0 src/sage/graphs/all__sagemath_tdlib.py | 0 src/sage/graphs/graph_decompositions/all__sagemath_tdlib.py | 0 src/sage/libs/all__sagemath_coxeter3.py | 0 src/sage/libs/all__sagemath_meataxe.py | 0 src/sage/libs/all__sagemath_sirocco.py | 0 src/sage/libs/coxeter3/all__sagemath_coxeter3.py | 0 src/sage/matrix/all__sagemath_meataxe.py | 0 21 files changed, 12 insertions(+) create mode 100644 src/sage/all__sagemath_bliss.py create mode 100644 src/sage/all__sagemath_coxeter3.py create mode 100644 src/sage/all__sagemath_mcqd.py create mode 100644 src/sage/all__sagemath_meataxe.py create mode 100644 src/sage/all__sagemath_sirocco.py create mode 100644 src/sage/all__sagemath_tdlib.py create mode 100644 src/sage/graphs/all__sagemath_bliss.py create mode 100644 src/sage/graphs/all__sagemath_mcqd.py create mode 100644 src/sage/graphs/all__sagemath_tdlib.py create mode 100644 src/sage/graphs/graph_decompositions/all__sagemath_tdlib.py create mode 100644 src/sage/libs/all__sagemath_coxeter3.py create mode 100644 src/sage/libs/all__sagemath_meataxe.py create mode 100644 src/sage/libs/all__sagemath_sirocco.py create mode 100644 src/sage/libs/coxeter3/all__sagemath_coxeter3.py create mode 100644 src/sage/matrix/all__sagemath_meataxe.py diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in index 8534471f1f2..2923c9ce4a7 100644 --- a/pkgs/sagemath-bliss/MANIFEST.in +++ b/pkgs/sagemath-bliss/MANIFEST.in @@ -1,3 +1,5 @@ +global-include all__sagemath_bliss.py + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-coxeter3/MANIFEST.in b/pkgs/sagemath-coxeter3/MANIFEST.in index 8534471f1f2..0061ae1f7cc 100644 --- a/pkgs/sagemath-coxeter3/MANIFEST.in +++ b/pkgs/sagemath-coxeter3/MANIFEST.in @@ -1,3 +1,5 @@ +global-include all__sagemath_coxeter3.py + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-mcqd/MANIFEST.in b/pkgs/sagemath-mcqd/MANIFEST.in index 8534471f1f2..779387be3a5 100644 --- a/pkgs/sagemath-mcqd/MANIFEST.in +++ b/pkgs/sagemath-mcqd/MANIFEST.in @@ -1,3 +1,5 @@ +global-include all__sagemath_mcqd.py + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-meataxe/MANIFEST.in b/pkgs/sagemath-meataxe/MANIFEST.in index 8534471f1f2..bdbeb10e55a 100644 --- a/pkgs/sagemath-meataxe/MANIFEST.in +++ b/pkgs/sagemath-meataxe/MANIFEST.in @@ -1,3 +1,5 @@ +global-include all__sagemath_meataxe.py + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-sirocco/MANIFEST.in b/pkgs/sagemath-sirocco/MANIFEST.in index 8534471f1f2..78c48dbb155 100644 --- a/pkgs/sagemath-sirocco/MANIFEST.in +++ b/pkgs/sagemath-sirocco/MANIFEST.in @@ -1,3 +1,5 @@ +global-include all__sagemath_sirocco.py + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-tdlib/MANIFEST.in b/pkgs/sagemath-tdlib/MANIFEST.in index 62ab4f26d05..8974b6a6ae6 100644 --- a/pkgs/sagemath-tdlib/MANIFEST.in +++ b/pkgs/sagemath-tdlib/MANIFEST.in @@ -1,3 +1,5 @@ +global-include all__sagemath_tdlib.py + include VERSION.txt global-exclude *.c diff --git a/src/sage/all__sagemath_bliss.py b/src/sage/all__sagemath_bliss.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/all__sagemath_coxeter3.py b/src/sage/all__sagemath_coxeter3.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/all__sagemath_mcqd.py b/src/sage/all__sagemath_mcqd.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/all__sagemath_meataxe.py b/src/sage/all__sagemath_meataxe.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/all__sagemath_sirocco.py b/src/sage/all__sagemath_sirocco.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/all__sagemath_tdlib.py b/src/sage/all__sagemath_tdlib.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/graphs/all__sagemath_bliss.py b/src/sage/graphs/all__sagemath_bliss.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/graphs/all__sagemath_mcqd.py b/src/sage/graphs/all__sagemath_mcqd.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/graphs/all__sagemath_tdlib.py b/src/sage/graphs/all__sagemath_tdlib.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/graphs/graph_decompositions/all__sagemath_tdlib.py b/src/sage/graphs/graph_decompositions/all__sagemath_tdlib.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/all__sagemath_coxeter3.py b/src/sage/libs/all__sagemath_coxeter3.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/all__sagemath_meataxe.py b/src/sage/libs/all__sagemath_meataxe.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/all__sagemath_sirocco.py b/src/sage/libs/all__sagemath_sirocco.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/libs/coxeter3/all__sagemath_coxeter3.py b/src/sage/libs/coxeter3/all__sagemath_coxeter3.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/sage/matrix/all__sagemath_meataxe.py b/src/sage/matrix/all__sagemath_meataxe.py new file mode 100644 index 00000000000..e69de29bb2d From 6b664cd8830f5b368cede6fe4a09b6b08eb25b25 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 13:12:44 -0700 Subject: [PATCH 22/42] .gitignore: Add new generated files --- .gitignore | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitignore b/.gitignore index cdb9c373c37..3f32bdd0878 100644 --- a/.gitignore +++ b/.gitignore @@ -175,14 +175,32 @@ build/bin/sage-build-env-config /pkgs/*/.tox /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 From 00d63d10461f6b6dac5f160e900725a7be71ddce Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 13:51:58 -0700 Subject: [PATCH 23/42] pkgs/{sagemath-bliss,...}: Fix setup.py so it includes Python/Cython sources in sdist --- pkgs/sagemath-bliss/setup.py | 17 ++++++----------- pkgs/sagemath-coxeter3/setup.py | 17 ++++++----------- pkgs/sagemath-mcqd/setup.py | 17 ++++++----------- pkgs/sagemath-meataxe/setup.py | 17 ++++++----------- pkgs/sagemath-sirocco/setup.py | 17 ++++++----------- pkgs/sagemath-tdlib/setup.py | 17 ++++++----------- 6 files changed, 36 insertions(+), 66 deletions(-) diff --git a/pkgs/sagemath-bliss/setup.py b/pkgs/sagemath-bliss/setup.py index 9c4bae94934..a78c51347d6 100644 --- a/pkgs/sagemath-bliss/setup.py +++ b/pkgs/sagemath-bliss/setup.py @@ -47,18 +47,13 @@ cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-bliss']) +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)) +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, diff --git a/pkgs/sagemath-coxeter3/setup.py b/pkgs/sagemath-coxeter3/setup.py index 639b1124e8a..50d81893558 100644 --- a/pkgs/sagemath-coxeter3/setup.py +++ b/pkgs/sagemath-coxeter3/setup.py @@ -47,18 +47,13 @@ cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-coxeter3']) +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)) +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, diff --git a/pkgs/sagemath-mcqd/setup.py b/pkgs/sagemath-mcqd/setup.py index 6b4850ef7b7..c7d90663bfc 100644 --- a/pkgs/sagemath-mcqd/setup.py +++ b/pkgs/sagemath-mcqd/setup.py @@ -47,18 +47,13 @@ cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-mcqd']) +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)) +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, diff --git a/pkgs/sagemath-meataxe/setup.py b/pkgs/sagemath-meataxe/setup.py index e59e1caa046..638c921a0d3 100644 --- a/pkgs/sagemath-meataxe/setup.py +++ b/pkgs/sagemath-meataxe/setup.py @@ -47,18 +47,13 @@ cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-meataxe']) +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)) +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, diff --git a/pkgs/sagemath-sirocco/setup.py b/pkgs/sagemath-sirocco/setup.py index 97f8cfba091..bffe9189bb5 100644 --- a/pkgs/sagemath-sirocco/setup.py +++ b/pkgs/sagemath-sirocco/setup.py @@ -47,18 +47,13 @@ cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-sirocco']) +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)) +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, diff --git a/pkgs/sagemath-tdlib/setup.py b/pkgs/sagemath-tdlib/setup.py index e9f63206386..12547533309 100644 --- a/pkgs/sagemath-tdlib/setup.py +++ b/pkgs/sagemath-tdlib/setup.py @@ -47,18 +47,13 @@ cmdclass = dict(build_cython=sage_build_cython, build_ext=sage_build_ext) -if sdist: - python_packages = [] - python_modules = [] - cython_modules = [] -else: - from sage_setup.find import find_python_sources - python_packages, python_modules, cython_modules = find_python_sources( - '.', ['sage'], distributions=['sagemath-tdlib']) +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)) +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, From c5a1e543577fe64c984a2d8463f70fb9ff6fde6a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 13:57:26 -0700 Subject: [PATCH 24/42] Add '# sage_setup: distribution' to some files --- src/sage/graphs/mcqd.pxd | 3 ++- src/sage/libs/coxeter3/coxeter.pxd | 2 ++ src/sage/libs/coxeter3/coxeter.pyx | 1 - src/sage/libs/coxeter3/coxeter_group.py | 3 ++- src/sage/libs/coxeter3/decl.pxd | 2 ++ src/sage/libs/meataxe.pxd | 2 ++ src/sage/matrix/matrix_gfpn_dense.pxd | 2 ++ 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/sage/graphs/mcqd.pxd b/src/sage/graphs/mcqd.pxd index d8d8b01bc72..d7a2faa6d58 100644 --- a/src/sage/graphs/mcqd.pxd +++ b/src/sage/graphs/mcqd.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-mcqd + from libcpp cimport bool cdef extern from "mcqd.h": @@ -5,4 +7,3 @@ cdef extern from "mcqd.h": Maxclique() Maxclique(bool **, int n) void mcqdyn(int * maxclique, int& size) - diff --git a/src/sage/libs/coxeter3/coxeter.pxd b/src/sage/libs/coxeter3/coxeter.pxd index cffa2505e39..9d5cb2a3f5d 100644 --- a/src/sage/libs/coxeter3/coxeter.pxd +++ b/src/sage/libs/coxeter3/coxeter.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-coxeter3 + #***************************************************************************** # Copyright (C) 2009-2013 Mike Hansen # diff --git a/src/sage/libs/coxeter3/coxeter.pyx b/src/sage/libs/coxeter3/coxeter.pyx index 9ef1d075be5..4c9762b4717 100644 --- a/src/sage/libs/coxeter3/coxeter.pyx +++ b/src/sage/libs/coxeter3/coxeter.pyx @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # distutils: language = c++ # distutils: libraries = coxeter3 # sage_setup: distribution = sagemath-coxeter3 diff --git a/src/sage/libs/coxeter3/coxeter_group.py b/src/sage/libs/coxeter3/coxeter_group.py index ab8dfb2ae0c..527cfc61c6f 100644 --- a/src/sage/libs/coxeter3/coxeter_group.py +++ b/src/sage/libs/coxeter3/coxeter_group.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# sage_setup: distribution = sagemath-coxeter3 + """ Coxeter Groups implemented with Coxeter3 """ diff --git a/src/sage/libs/coxeter3/decl.pxd b/src/sage/libs/coxeter3/decl.pxd index 56002154226..4f9c7b0c186 100644 --- a/src/sage/libs/coxeter3/decl.pxd +++ b/src/sage/libs/coxeter3/decl.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-coxeter3 + #***************************************************************************** # Copyright (C) 2009-2013 Mike Hansen # diff --git a/src/sage/libs/meataxe.pxd b/src/sage/libs/meataxe.pxd index 68c8b3467b0..0a928e19c37 100644 --- a/src/sage/libs/meataxe.pxd +++ b/src/sage/libs/meataxe.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-meataxe + #***************************************************************************** # Copyright (C) 2015 Simon King # diff --git a/src/sage/matrix/matrix_gfpn_dense.pxd b/src/sage/matrix/matrix_gfpn_dense.pxd index 92b0a78d6d2..7a457876b9a 100644 --- a/src/sage/matrix/matrix_gfpn_dense.pxd +++ b/src/sage/matrix/matrix_gfpn_dense.pxd @@ -1,3 +1,5 @@ +# sage_setup: distribution = sagemath-meataxe + #***************************************************************************** # Copyright (C) 2015 Simon King # From 41ad7a4cc002a034f68d4e2a256ed3c58e845b6b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 14:48:28 -0700 Subject: [PATCH 25/42] pkgs/sagemath-{coxeter3,mcqd,meataxe}: Include pxd files via MANIFEST.in and setup.cfgFix setup.py --- pkgs/sagemath-coxeter3/MANIFEST.in | 4 ++++ pkgs/sagemath-coxeter3/setup.cfg.m4 | 8 ++++++++ pkgs/sagemath-mcqd/MANIFEST.in | 4 ++++ pkgs/sagemath-mcqd/setup.cfg.m4 | 7 +++++++ pkgs/sagemath-meataxe/MANIFEST.in | 5 +++++ pkgs/sagemath-meataxe/setup.cfg.m4 | 11 +++++++++++ 6 files changed, 39 insertions(+) diff --git a/pkgs/sagemath-coxeter3/MANIFEST.in b/pkgs/sagemath-coxeter3/MANIFEST.in index 0061ae1f7cc..523791d6286 100644 --- a/pkgs/sagemath-coxeter3/MANIFEST.in +++ b/pkgs/sagemath-coxeter3/MANIFEST.in @@ -1,5 +1,9 @@ +prune sage + global-include all__sagemath_coxeter3.py +graft sage/libs/coxeter3 + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 index aad6b620681..95692ec4be5 100644 --- a/pkgs/sagemath-coxeter3/setup.cfg.m4 +++ b/pkgs/sagemath-coxeter3/setup.cfg.m4 @@ -31,3 +31,11 @@ install_requires = esyscmd(`sage-get-system-packages install-requires \ sagelib \ | sed "2,\$s/^/ /;"')dnl + +packages = + sage.libs.coxeter3 + +[options.package_data] +sage.libs.coxeter3 = + coxeter.pxd + decl.pxd diff --git a/pkgs/sagemath-mcqd/MANIFEST.in b/pkgs/sagemath-mcqd/MANIFEST.in index 779387be3a5..cc0041d062b 100644 --- a/pkgs/sagemath-mcqd/MANIFEST.in +++ b/pkgs/sagemath-mcqd/MANIFEST.in @@ -1,5 +1,9 @@ +prune sage + global-include all__sagemath_mcqd.py +include sage/graphs/mcqd.p* + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 index 9007469c4b9..d059104976e 100644 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -31,3 +31,10 @@ install_requires = esyscmd(`sage-get-system-packages install-requires \ sagelib \ | sed "2,\$s/^/ /;"')dnl + +packages = + sage.graphs + +[options.package_data] +sage.graphs = + mcqd.pxd diff --git a/pkgs/sagemath-meataxe/MANIFEST.in b/pkgs/sagemath-meataxe/MANIFEST.in index bdbeb10e55a..1573689b0ce 100644 --- a/pkgs/sagemath-meataxe/MANIFEST.in +++ b/pkgs/sagemath-meataxe/MANIFEST.in @@ -1,5 +1,10 @@ +prune sage + global-include all__sagemath_meataxe.py +include sage/libs/meataxe.p* +include sage/matrix/matrix_gfpn_dense.p* + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 index f22941464d5..cbdedc996ab 100644 --- a/pkgs/sagemath-meataxe/setup.cfg.m4 +++ b/pkgs/sagemath-meataxe/setup.cfg.m4 @@ -31,3 +31,14 @@ install_requires = esyscmd(`sage-get-system-packages install-requires \ sagelib \ | sed "2,\$s/^/ /;"')dnl + +packages = + sage.libs + sage.matrix + +[options.package_data] +sage.libs = + meataxe.pxd + +sage.matrix = + matrix_gfpn_dense.pxd From d1431c6af649b5d8bba1410de6fd7d40fe283ea1 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 15:43:14 -0700 Subject: [PATCH 26/42] pkgs/sagemath-{bliss,...}: Add VERSION.txt to MANIFEST.in --- pkgs/sagemath-bliss/MANIFEST.in | 2 ++ pkgs/sagemath-coxeter3/MANIFEST.in | 2 ++ pkgs/sagemath-mcqd/MANIFEST.in | 2 ++ pkgs/sagemath-sirocco/MANIFEST.in | 2 ++ 4 files changed, 8 insertions(+) diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in index 2923c9ce4a7..729d372baf3 100644 --- a/pkgs/sagemath-bliss/MANIFEST.in +++ b/pkgs/sagemath-bliss/MANIFEST.in @@ -1,5 +1,7 @@ global-include all__sagemath_bliss.py +include VERSION.txt + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-coxeter3/MANIFEST.in b/pkgs/sagemath-coxeter3/MANIFEST.in index 523791d6286..003ab8d5180 100644 --- a/pkgs/sagemath-coxeter3/MANIFEST.in +++ b/pkgs/sagemath-coxeter3/MANIFEST.in @@ -2,6 +2,8 @@ prune sage global-include all__sagemath_coxeter3.py +include VERSION.txt + graft sage/libs/coxeter3 global-exclude *.c diff --git a/pkgs/sagemath-mcqd/MANIFEST.in b/pkgs/sagemath-mcqd/MANIFEST.in index cc0041d062b..392d97b78e0 100644 --- a/pkgs/sagemath-mcqd/MANIFEST.in +++ b/pkgs/sagemath-mcqd/MANIFEST.in @@ -2,6 +2,8 @@ prune sage global-include all__sagemath_mcqd.py +include VERSION.txt + include sage/graphs/mcqd.p* global-exclude *.c diff --git a/pkgs/sagemath-sirocco/MANIFEST.in b/pkgs/sagemath-sirocco/MANIFEST.in index 78c48dbb155..7fab4dffc5d 100644 --- a/pkgs/sagemath-sirocco/MANIFEST.in +++ b/pkgs/sagemath-sirocco/MANIFEST.in @@ -1,5 +1,7 @@ global-include all__sagemath_sirocco.py +include VERSION.txt + global-exclude *.c global-exclude *.cpp From ab7d9d0debb12d47b123264e4e308b18f16ee2aa Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 15:59:22 -0700 Subject: [PATCH 27/42] pkgs/sagemath-meataxe/MANIFEST.in: Add VERSION.txt --- pkgs/sagemath-meataxe/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/sagemath-meataxe/MANIFEST.in b/pkgs/sagemath-meataxe/MANIFEST.in index 1573689b0ce..4cf78dd5d02 100644 --- a/pkgs/sagemath-meataxe/MANIFEST.in +++ b/pkgs/sagemath-meataxe/MANIFEST.in @@ -2,6 +2,8 @@ prune sage global-include all__sagemath_meataxe.py +include VERSION.txt + include sage/libs/meataxe.p* include sage/matrix/matrix_gfpn_dense.p* From c4b70fe23cc6a322fdd92c3dfe4d07ac3bdbbdf5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 15:59:51 -0700 Subject: [PATCH 28/42] pkgs/sagemath-tdlib/MANIFEST.in: Add a source cpp file --- pkgs/sagemath-tdlib/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/sagemath-tdlib/MANIFEST.in b/pkgs/sagemath-tdlib/MANIFEST.in index 8974b6a6ae6..f3fbc97a588 100644 --- a/pkgs/sagemath-tdlib/MANIFEST.in +++ b/pkgs/sagemath-tdlib/MANIFEST.in @@ -5,6 +5,8 @@ include VERSION.txt global-exclude *.c global-exclude *.cpp +include sage/graphs/graph_decompositions/sage_tdlib.cpp + global-exclude __pycache__ global-exclude *.py[co] global-exclude *.bak From e49a66d3f112337adcca26be159ccfc66205010e Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 16 Nov 2022 00:04:22 -0800 Subject: [PATCH 29/42] Update SPKG.rst --- pkgs/sagemath-meataxe/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/sagemath-meataxe/README.rst b/pkgs/sagemath-meataxe/README.rst index 659edb3cf9f..088ce86478b 100644 --- a/pkgs/sagemath-meataxe/README.rst +++ b/pkgs/sagemath-meataxe/README.rst @@ -28,8 +28,8 @@ 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``. +This distribution provides the SageMath modules :mod:`sage.libs.meataxe` +and :mod:`sage.matrix.matrix_gfpn_dense`. It provides a specialized implementation of matrices over the finite field F_q, where q <= 255, using the `SharedMeatAxe ` From e11610f81d935419a213f62b0441d8012046d268 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 17:10:20 -0700 Subject: [PATCH 30/42] Fix short descriptions in setup.cfg.m4 --- pkgs/sagemath-coxeter3/setup.cfg.m4 | 2 +- pkgs/sagemath-mcqd/setup.cfg.m4 | 2 +- pkgs/sagemath-meataxe/setup.cfg.m4 | 2 +- pkgs/sagemath-tdlib/setup.cfg.m4 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 index 95692ec4be5..8b7a709b860 100644 --- a/pkgs/sagemath-coxeter3/setup.cfg.m4 +++ b/pkgs/sagemath-coxeter3/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-coxeter3 version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with coxeter3 +description = Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3 long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 index d059104976e..221d71aa860 100644 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-mcqd version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with mcqd +description = Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 index cbdedc996ab..d76a8076c13 100644 --- a/pkgs/sagemath-meataxe/setup.cfg.m4 +++ b/pkgs/sagemath-meataxe/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-meataxe version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with meataxe +description = Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 index c8ddc1ea631..828422d7909 100644 --- a/pkgs/sagemath-tdlib/setup.cfg.m4 +++ b/pkgs/sagemath-tdlib/setup.cfg.m4 @@ -2,7 +2,7 @@ [metadata] name = sagemath-tdlib version = file: VERSION.txt -description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with tdlib +description = Sage: Open Source Mathematics Software: Tree decompositions with tdlib long_description = file: README.rst long_description_content_type = text/x-rst license = GNU General Public License (GPL) v2 or later From 612ca8fb2f76b682633902e201faca264d15fd85 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 18:35:30 -0700 Subject: [PATCH 31/42] build/pkgs/sagelib/spkg-install: Remove fes --- build/pkgs/sagelib/spkg-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagelib/spkg-install b/build/pkgs/sagelib/spkg-install index dd1ddab1fc8..730829b3101 100755 --- a/build/pkgs/sagelib/spkg-install +++ b/build/pkgs/sagelib/spkg-install @@ -81,7 +81,7 @@ else # Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd time sdh_pip_install --no-build-isolation . else - SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+="mcqd,tdlib,coxeter3,fes,sirocco,meataxe,bliss" + SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+="mcqd,tdlib,coxeter3,sirocco,meataxe,bliss" time python3 -u setup.py --no-user-cfg build install || exit 1 fi fi From e7161949cf421976060ed0e83ebccd7f9a6087dd Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 21 May 2023 22:37:19 -0700 Subject: [PATCH 32/42] Remove dependencies on sagelib --- build/pkgs/sagemath_bliss/dependencies | 2 +- build/pkgs/sagemath_coxeter3/dependencies | 2 +- build/pkgs/sagemath_mcqd/dependencies | 2 +- build/pkgs/sagemath_meataxe/dependencies | 2 +- build/pkgs/sagemath_sirocco/dependencies | 2 +- build/pkgs/sagemath_tdlib/dependencies | 2 +- pkgs/sagemath-bliss/setup.cfg.m4 | 3 --- pkgs/sagemath-coxeter3/setup.cfg.m4 | 3 --- pkgs/sagemath-mcqd/setup.cfg.m4 | 3 --- pkgs/sagemath-meataxe/setup.cfg.m4 | 4 ---- pkgs/sagemath-sirocco/setup.cfg.m4 | 4 ---- pkgs/sagemath-tdlib/setup.cfg.m4 | 3 --- 12 files changed, 6 insertions(+), 26 deletions(-) diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies index 88ac8461924..fa7eeb27d16 100644 --- a/build/pkgs/sagemath_bliss/dependencies +++ b/build/pkgs/sagemath_bliss/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib bliss | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) bliss | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies index 55f26dde8e1..4dec029c090 100644 --- a/build/pkgs/sagemath_coxeter3/dependencies +++ b/build/pkgs/sagemath_coxeter3/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies index 9d0b4667b19..966a8e5d773 100644 --- a/build/pkgs/sagemath_mcqd/dependencies +++ b/build/pkgs/sagemath_mcqd/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib mcqd | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) mcqd | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies index c1f2d173d62..e4015c1f32d 100644 --- a/build/pkgs/sagemath_meataxe/dependencies +++ b/build/pkgs/sagemath_meataxe/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib meataxe | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies index b1c36d924fe..98afa6177f4 100644 --- a/build/pkgs/sagemath_sirocco/dependencies +++ b/build/pkgs/sagemath_sirocco/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib sirocco | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sirocco | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies index 455f0b4067f..76b1c300af1 100644 --- a/build/pkgs/sagemath_tdlib/dependencies +++ b/build/pkgs/sagemath_tdlib/dependencies @@ -1 +1 @@ -$(PYTHON) sagelib tdlib | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) tdlib | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 index 098b0a36e42..76aed10bf09 100644 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -28,6 +28,3 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagelib \ - | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 index 8b7a709b860..308514b459c 100644 --- a/pkgs/sagemath-coxeter3/setup.cfg.m4 +++ b/pkgs/sagemath-coxeter3/setup.cfg.m4 @@ -28,9 +28,6 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagelib \ - | sed "2,\$s/^/ /;"')dnl packages = sage.libs.coxeter3 diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 index 221d71aa860..a318b3b9c01 100644 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -28,9 +28,6 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagelib \ - | sed "2,\$s/^/ /;"')dnl packages = sage.graphs diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 index d76a8076c13..ea05927588c 100644 --- a/pkgs/sagemath-meataxe/setup.cfg.m4 +++ b/pkgs/sagemath-meataxe/setup.cfg.m4 @@ -27,10 +27,6 @@ classifiers = [options] python_requires = >=3.8, <3.12 -install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagelib \ - | sed "2,\$s/^/ /;"')dnl packages = sage.libs diff --git a/pkgs/sagemath-sirocco/setup.cfg.m4 b/pkgs/sagemath-sirocco/setup.cfg.m4 index 80f5fec8380..16f206be709 100644 --- a/pkgs/sagemath-sirocco/setup.cfg.m4 +++ b/pkgs/sagemath-sirocco/setup.cfg.m4 @@ -27,7 +27,3 @@ classifiers = [options] python_requires = >=3.8, <3.12 -install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagelib \ - | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 index 828422d7909..8bd8390e341 100644 --- a/pkgs/sagemath-tdlib/setup.cfg.m4 +++ b/pkgs/sagemath-tdlib/setup.cfg.m4 @@ -28,6 +28,3 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - sagelib \ - | sed "2,\$s/^/ /;"')dnl From f0944e65255b70883283d2cdfb5e2585253263b5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 22 May 2023 10:33:23 -0700 Subject: [PATCH 33/42] build/pkgs/sagemath_mcqd, pkgs/sagemath-mcqd: Fix dependencies --- build/pkgs/sagemath_mcqd/dependencies | 2 +- pkgs/sagemath-mcqd/pyproject.toml.m4 | 4 +--- pkgs/sagemath-mcqd/setup.cfg.m4 | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies index 966a8e5d773..e383df7dafa 100644 --- a/build/pkgs/sagemath_mcqd/dependencies +++ b/build/pkgs/sagemath_mcqd/dependencies @@ -1 +1 @@ -$(PYTHON) mcqd | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 index aa4c23992be..a297f180a66 100644 --- a/pkgs/sagemath-mcqd/pyproject.toml.m4 +++ b/pkgs/sagemath-mcqd/pyproject.toml.m4 @@ -3,12 +3,10 @@ requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ - wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ cython \ - gmpy2 \ + memory_allocator \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 index a318b3b9c01..d6c5bc256ef 100644 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -28,6 +28,10 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = + esyscmd(`sage-get-system-packages install-requires \ + memory_allocator \ + cysignals \ + | sed "2,\$s/^/ /;"')dnl packages = sage.graphs From f25ba22dfc39847ad7668c1fc682a02d4343f7ff Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 22 May 2023 10:42:01 -0700 Subject: [PATCH 34/42] build/pkgs/sagemath_sirocco, pkgs/sagemath-sirocco: Fix dependencies --- build/pkgs/sagemath_sirocco/dependencies | 2 +- pkgs/sagemath-sirocco/pyproject.toml.m4 | 4 +--- pkgs/sagemath-sirocco/setup.cfg.m4 | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies index 98afa6177f4..354410e5420 100644 --- a/build/pkgs/sagemath_sirocco/dependencies +++ b/build/pkgs/sagemath_sirocco/dependencies @@ -1 +1 @@ -$(PYTHON) sirocco | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 index aa4c23992be..29243f6f627 100644 --- a/pkgs/sagemath-sirocco/pyproject.toml.m4 +++ b/pkgs/sagemath-sirocco/pyproject.toml.m4 @@ -3,12 +3,10 @@ requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ - wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ cython \ - gmpy2 \ + cypari \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-sirocco/setup.cfg.m4 b/pkgs/sagemath-sirocco/setup.cfg.m4 index 16f206be709..81d15782fb7 100644 --- a/pkgs/sagemath-sirocco/setup.cfg.m4 +++ b/pkgs/sagemath-sirocco/setup.cfg.m4 @@ -27,3 +27,8 @@ classifiers = [options] python_requires = >=3.8, <3.12 +install_requires = + esyscmd(`sage-get-system-packages install-requires \ + cypari \ + cysignals \ + | sed "2,\$s/^/ /;"')dnl From f20cc6bcd3d67dc510953d943831f4648951b31c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 22 May 2023 10:59:09 -0700 Subject: [PATCH 35/42] Fix more dependencies --- build/pkgs/sagemath_bliss/dependencies | 2 +- build/pkgs/sagemath_coxeter3/dependencies | 2 +- build/pkgs/sagemath_meataxe/dependencies | 2 +- build/pkgs/sagemath_sirocco/dependencies | 2 +- build/pkgs/sagemath_tdlib/dependencies | 2 +- pkgs/sagemath-bliss/pyproject.toml.m4 | 3 --- pkgs/sagemath-bliss/setup.cfg.m4 | 3 +++ pkgs/sagemath-coxeter3/pyproject.toml.m4 | 3 --- pkgs/sagemath-meataxe/pyproject.toml.m4 | 3 --- pkgs/sagemath-tdlib/pyproject.toml.m4 | 3 --- pkgs/sagemath-tdlib/setup.cfg.m4 | 3 +++ 11 files changed, 11 insertions(+), 17 deletions(-) diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies index fa7eeb27d16..a44aaaec3a1 100644 --- a/build/pkgs/sagemath_bliss/dependencies +++ b/build/pkgs/sagemath_bliss/dependencies @@ -1 +1 @@ -$(PYTHON) bliss | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies index 4dec029c090..615392ca427 100644 --- a/build/pkgs/sagemath_coxeter3/dependencies +++ b/build/pkgs/sagemath_coxeter3/dependencies @@ -1 +1 @@ -$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies index e4015c1f32d..f100932802a 100644 --- a/build/pkgs/sagemath_meataxe/dependencies +++ b/build/pkgs/sagemath_meataxe/dependencies @@ -1 +1 @@ -$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) meataxe | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/build/pkgs/sagemath_sirocco/dependencies b/build/pkgs/sagemath_sirocco/dependencies index 354410e5420..b923f34d7eb 100644 --- a/build/pkgs/sagemath_sirocco/dependencies +++ b/build/pkgs/sagemath_sirocco/dependencies @@ -1 +1 @@ -$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies index 76b1c300af1..5c7ecd31f2f 100644 --- a/build/pkgs/sagemath_tdlib/dependencies +++ b/build/pkgs/sagemath_tdlib/dependencies @@ -1 +1 @@ -$(PYTHON) tdlib | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig +$(PYTHON) tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index aa4c23992be..88f6970937c 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -3,12 +3,9 @@ requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ - wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ cython \ - gmpy2 \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 index 76aed10bf09..89e12a6d299 100644 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -28,3 +28,6 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = + esyscmd(`sage-get-system-packages install-requires \ + cysignals \ + | sed "2,\$s/^/ /;"')dnl diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 index aa4c23992be..88f6970937c 100644 --- a/pkgs/sagemath-coxeter3/pyproject.toml.m4 +++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4 @@ -3,12 +3,9 @@ requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ - wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ cython \ - gmpy2 \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 index aa4c23992be..88f6970937c 100644 --- a/pkgs/sagemath-meataxe/pyproject.toml.m4 +++ b/pkgs/sagemath-meataxe/pyproject.toml.m4 @@ -3,12 +3,9 @@ requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ - wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ cython \ - gmpy2 \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 index aa4c23992be..88f6970937c 100644 --- a/pkgs/sagemath-tdlib/pyproject.toml.m4 +++ b/pkgs/sagemath-tdlib/pyproject.toml.m4 @@ -3,12 +3,9 @@ requires = [ esyscmd(`sage-get-system-packages install-requires-toml \ setuptools \ - wheel \ sage_setup \ sagemath_environment \ - sagemath_standard \ cython \ - gmpy2 \ cysignals \ ')] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 index 8bd8390e341..18564c8696f 100644 --- a/pkgs/sagemath-tdlib/setup.cfg.m4 +++ b/pkgs/sagemath-tdlib/setup.cfg.m4 @@ -28,3 +28,6 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = + esyscmd(`sage-get-system-packages install-requires \ + cysignals \ + | sed "2,\$s/^/ /;"')dnl From 7c04f4417aa3118bdacf5da10cc0f8eab9e43040 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 5 Jun 2023 21:35:17 -0700 Subject: [PATCH 36/42] build/pkgs/bliss/distros/gentoo.txt: New --- build/pkgs/bliss/distros/gentoo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/bliss/distros/gentoo.txt diff --git a/build/pkgs/bliss/distros/gentoo.txt b/build/pkgs/bliss/distros/gentoo.txt new file mode 100644 index 00000000000..73add6de49d --- /dev/null +++ b/build/pkgs/bliss/distros/gentoo.txt @@ -0,0 +1 @@ +sci-libs/bliss From 291b016fdb1b6f7bcc34a6d133a2c571aaab4e09 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 19 Jun 2023 17:36:07 -0700 Subject: [PATCH 37/42] bootstrap: Generate m4/sage_spkg_versions.m4, use in pkgs/*/setup.cfg.m4 --- pkgs/sagemath-bliss/setup.cfg.m4 | 6 ++---- pkgs/sagemath-coxeter3/setup.cfg.m4 | 2 +- pkgs/sagemath-mcqd/setup.cfg.m4 | 8 +++----- pkgs/sagemath-meataxe/setup.cfg.m4 | 2 +- pkgs/sagemath-sirocco/setup.cfg.m4 | 8 +++----- pkgs/sagemath-tdlib/setup.cfg.m4 | 7 ++----- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 index 89e12a6d299..265dfbbef00 100644 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-bliss version = file: VERSION.txt @@ -28,6 +28,4 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - cysignals \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_cysignals diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 index 308514b459c..60960662d03 100644 --- a/pkgs/sagemath-coxeter3/setup.cfg.m4 +++ b/pkgs/sagemath-coxeter3/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-coxeter3 version = file: VERSION.txt diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 index d6c5bc256ef..8ade86ffa8d 100644 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-mcqd version = file: VERSION.txt @@ -28,10 +28,8 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - memory_allocator \ - cysignals \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_memory_allocator + SPKG_INSTALL_REQUIRES_cysignals packages = sage.graphs diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 index ea05927588c..b3829c6a6a2 100644 --- a/pkgs/sagemath-meataxe/setup.cfg.m4 +++ b/pkgs/sagemath-meataxe/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-meataxe version = file: VERSION.txt diff --git a/pkgs/sagemath-sirocco/setup.cfg.m4 b/pkgs/sagemath-sirocco/setup.cfg.m4 index 81d15782fb7..9057bd85615 100644 --- a/pkgs/sagemath-sirocco/setup.cfg.m4 +++ b/pkgs/sagemath-sirocco/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-sirocco version = file: VERSION.txt @@ -28,7 +28,5 @@ classifiers = [options] python_requires = >=3.8, <3.12 install_requires = - esyscmd(`sage-get-system-packages install-requires \ - cypari \ - cysignals \ - | sed "2,\$s/^/ /;"')dnl + SPKG_INSTALL_REQUIRES_cypari + SPKG_INSTALL_REQUIRES_cysignals diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 index 18564c8696f..99b1132cbe0 100644 --- a/pkgs/sagemath-tdlib/setup.cfg.m4 +++ b/pkgs/sagemath-tdlib/setup.cfg.m4 @@ -1,4 +1,4 @@ -# -*- conf-unix -*- +include(`sage_spkg_versions.m4')dnl' -*- conf-unix -*- [metadata] name = sagemath-tdlib version = file: VERSION.txt @@ -27,7 +27,4 @@ classifiers = [options] python_requires = >=3.8, <3.12 -install_requires = - esyscmd(`sage-get-system-packages install-requires \ - cysignals \ - | sed "2,\$s/^/ /;"')dnl +install_requires = SPKG_INSTALL_REQUIRES_cysignals From 0f5fcb074fe16c9ab803a4f007c7fa8ec742f125 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 20 Jun 2023 13:22:50 -0700 Subject: [PATCH 38/42] bootstrap: Write m4/sage_spkg_versions_toml.m4 and use it in pkgs/*/pyproject.toml.m4 --- pkgs/sagemath-bliss/pyproject.toml.m4 | 14 +++++++------- pkgs/sagemath-coxeter3/pyproject.toml.m4 | 14 +++++++------- pkgs/sagemath-mcqd/pyproject.toml.m4 | 16 ++++++++-------- pkgs/sagemath-meataxe/pyproject.toml.m4 | 14 +++++++------- pkgs/sagemath-sirocco/pyproject.toml.m4 | 16 ++++++++-------- pkgs/sagemath-tdlib/pyproject.toml.m4 | 14 +++++++------- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index 88f6970937c..e5b939e414d 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -1,11 +1,11 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - cython \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-coxeter3/pyproject.toml.m4 b/pkgs/sagemath-coxeter3/pyproject.toml.m4 index 88f6970937c..e5b939e414d 100644 --- a/pkgs/sagemath-coxeter3/pyproject.toml.m4 +++ b/pkgs/sagemath-coxeter3/pyproject.toml.m4 @@ -1,11 +1,11 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - cython \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-mcqd/pyproject.toml.m4 b/pkgs/sagemath-mcqd/pyproject.toml.m4 index a297f180a66..d28ff179a00 100644 --- a/pkgs/sagemath-mcqd/pyproject.toml.m4 +++ b/pkgs/sagemath-mcqd/pyproject.toml.m4 @@ -1,12 +1,12 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - cython \ - memory_allocator \ - cysignals \ - ')] + 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 +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-meataxe/pyproject.toml.m4 b/pkgs/sagemath-meataxe/pyproject.toml.m4 index 88f6970937c..e5b939e414d 100644 --- a/pkgs/sagemath-meataxe/pyproject.toml.m4 +++ b/pkgs/sagemath-meataxe/pyproject.toml.m4 @@ -1,11 +1,11 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - cython \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-sirocco/pyproject.toml.m4 b/pkgs/sagemath-sirocco/pyproject.toml.m4 index 29243f6f627..1b000bd5c3b 100644 --- a/pkgs/sagemath-sirocco/pyproject.toml.m4 +++ b/pkgs/sagemath-sirocco/pyproject.toml.m4 @@ -1,12 +1,12 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - cython \ - cypari \ - cysignals \ - ')] + 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 +] build-backend = "setuptools.build_meta" diff --git a/pkgs/sagemath-tdlib/pyproject.toml.m4 b/pkgs/sagemath-tdlib/pyproject.toml.m4 index 88f6970937c..e5b939e414d 100644 --- a/pkgs/sagemath-tdlib/pyproject.toml.m4 +++ b/pkgs/sagemath-tdlib/pyproject.toml.m4 @@ -1,11 +1,11 @@ +include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- [build-system] # Minimum requirements for the build system to execute. requires = [ - esyscmd(`sage-get-system-packages install-requires-toml \ - setuptools \ - sage_setup \ - sagemath_environment \ - cython \ - cysignals \ - ')] + SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_setup + SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_cython + SPKG_INSTALL_REQUIRES_cysignals +] build-backend = "setuptools.build_meta" From bc474fa2e128485051aa54da6e5d9f5207e7a8fc Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 28 Jun 2023 18:22:26 -0700 Subject: [PATCH 39/42] pkgs/sagemath-bliss: Update after upgrade to 0.77, add tests --- pkgs/sagemath-bliss/MANIFEST.in | 2 ++ pkgs/sagemath-bliss/pyproject.toml.m4 | 1 + pkgs/sagemath-bliss/setup.cfg.m4 | 4 ++++ src/sage/graphs/bliss_cpp/bliss_find_automorphisms.h | 2 ++ 4 files changed, 9 insertions(+) diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in index 729d372baf3..689b87560e0 100644 --- a/pkgs/sagemath-bliss/MANIFEST.in +++ b/pkgs/sagemath-bliss/MANIFEST.in @@ -2,6 +2,8 @@ global-include all__sagemath_bliss.py include VERSION.txt +graft sage/graphs/bliss_cpp + global-exclude *.c global-exclude *.cpp diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index e5b939e414d..439482ad26b 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -3,6 +3,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- # Minimum requirements for the build system to execute. requires = [ SPKG_INSTALL_REQUIRES_setuptools + SPKG_INSTALL_REQUIRES_sage_conf SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 index 265dfbbef00..427f38ff060 100644 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -29,3 +29,7 @@ classifiers = python_requires = >=3.8, <3.12 install_requires = SPKG_INSTALL_REQUIRES_cysignals + +[options.extras_require] +test = + SPKG_INSTALL_REQUIRES_sagemath_repl diff --git a/src/sage/graphs/bliss_cpp/bliss_find_automorphisms.h b/src/sage/graphs/bliss_cpp/bliss_find_automorphisms.h index a2c084a163e..b87a14e7a8c 100644 --- a/src/sage/graphs/bliss_cpp/bliss_find_automorphisms.h +++ b/src/sage/graphs/bliss_cpp/bliss_find_automorphisms.h @@ -1,3 +1,5 @@ +/* sage_setup: distribution = sagemath-bliss */ + #include #include From af9592a8c37afb780fe1e7bf199675e1a63d266d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 3 Dec 2022 20:40:03 -0800 Subject: [PATCH 40/42] pkgs/sagemath-environment: Add sage.misc.package_dir properly --- pkgs/sagemath-environment/setup.cfg.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/sagemath-environment/setup.cfg.m4 b/pkgs/sagemath-environment/setup.cfg.m4 index deb74565b3b..1ede94ee283 100644 --- a/pkgs/sagemath-environment/setup.cfg.m4 +++ b/pkgs/sagemath-environment/setup.cfg.m4 @@ -17,6 +17,7 @@ py_modules = sage.version sage.misc.all__sagemath_environment sage.misc.package + sage.misc.package_dir sage.misc.temporary_file sage.misc.viewer From 08f8a596c751fee9eddf191cc0207abd8fa169ba Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 19 Jun 2023 10:20:50 -0700 Subject: [PATCH 41/42] Include m4/setup_cfg_metadata.m4 in setup.cfg files to reduce boilerplate --- pkgs/sagemath-bliss/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-coxeter3/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-mcqd/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-meataxe/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-sirocco/setup.cfg.m4 | 20 +------------------- pkgs/sagemath-tdlib/setup.cfg.m4 | 20 +------------------- 6 files changed, 6 insertions(+), 114 deletions(-) diff --git a/pkgs/sagemath-bliss/setup.cfg.m4 b/pkgs/sagemath-bliss/setup.cfg.m4 index 427f38ff060..d1faa96a563 100644 --- a/pkgs/sagemath-bliss/setup.cfg.m4 +++ b/pkgs/sagemath-bliss/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Graph (iso/auto)morphisms with bliss long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-coxeter3/setup.cfg.m4 b/pkgs/sagemath-coxeter3/setup.cfg.m4 index 60960662d03..ab3288d89ab 100644 --- a/pkgs/sagemath-coxeter3/setup.cfg.m4 +++ b/pkgs/sagemath-coxeter3/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Coxeter groups, Bruhat ordering, Kazhdan-Lusztig polynomials with coxeter3 long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-mcqd/setup.cfg.m4 b/pkgs/sagemath-mcqd/setup.cfg.m4 index 8ade86ffa8d..fff8f2805ef 100644 --- a/pkgs/sagemath-mcqd/setup.cfg.m4 +++ b/pkgs/sagemath-mcqd/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Finding maximum cliques with mcqd long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-meataxe/setup.cfg.m4 b/pkgs/sagemath-meataxe/setup.cfg.m4 index b3829c6a6a2..a558825e120 100644 --- a/pkgs/sagemath-meataxe/setup.cfg.m4 +++ b/pkgs/sagemath-meataxe/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Matrices over small finite fields with meataxe long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-sirocco/setup.cfg.m4 b/pkgs/sagemath-sirocco/setup.cfg.m4 index 9057bd85615..4f1e0f03d95 100644 --- a/pkgs/sagemath-sirocco/setup.cfg.m4 +++ b/pkgs/sagemath-sirocco/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Certified root continuation with sirocco long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 diff --git a/pkgs/sagemath-tdlib/setup.cfg.m4 b/pkgs/sagemath-tdlib/setup.cfg.m4 index 99b1132cbe0..62833bbe6f6 100644 --- a/pkgs/sagemath-tdlib/setup.cfg.m4 +++ b/pkgs/sagemath-tdlib/setup.cfg.m4 @@ -5,25 +5,7 @@ version = file: VERSION.txt description = Sage: Open Source Mathematics Software: Tree decompositions with tdlib long_description = file: README.rst long_description_content_type = text/x-rst -license = GNU General Public License (GPL) v2 or later -author = The Sage Developers -author_email = sage-support@googlegroups.com -url = https://www.sagemath.org - -classifiers = - Development Status :: 6 - Mature - Intended Audience :: Education - Intended Audience :: Science/Research - License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+) - Operating System :: POSIX - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: Implementation :: CPython - Topic :: Scientific/Engineering :: Mathematics +include(`setup_cfg_metadata.m4')dnl' [options] python_requires = >=3.8, <3.12 From 9bb15bcc6dd3b6eb93bdaad8ac46ce9533a419ef Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 23 Jul 2023 14:31:54 -0700 Subject: [PATCH 42/42] build/pkgs/sagemath_bliss: Fixups --- build/pkgs/sagemath_bliss/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies index a44aaaec3a1..279e79ace91 100644 --- a/build/pkgs/sagemath_bliss/dependencies +++ b/build/pkgs/sagemath_bliss/dependencies @@ -1 +1 @@ -$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig +$(PYTHON) bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig