sagemath · mkoeppe · Jan 4, 2024 · Dec 31, 2023 · Jan 4, 2024 · Jan 4, 2024
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@
 /src/pyproject.toml
 /src/Pipfile
 /src/Pipfile.lock
+/src/pyproject.toml
 /Pipfile
 /Pipfile.lock
 
@@ -259,6 +260,9 @@ src/*.egg-info/
 /src/bin/sage-env-config
 /src/bin/sage-src-env-config
 
+# Generated by sage-generate-meson
+/src/**/meson.build
+
 # Virtual environments
 /venv
 src/.env

diff --git a/build/pkgs/sagelib/spkg-install.in b/build/pkgs/sagelib/spkg-install.in
@@ -41,6 +41,13 @@ unset SAGE_PKG_CONFIG_PATH
 # spec, which includes setting a symlink to the installed documentation.
 # export SAGE_DOC=/doesnotexist
 
+if [ "$SAGE_WHEELS" = yes ]; then
+    # For meson
+    export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g')
+    export CYTHON=sage-cython
+    export CYTHON_FOR_BUILD=sage-cython
+fi
+
 SITEPACKAGESDIR=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
 
 export SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS=""
@@ -57,7 +64,7 @@ if [ "$SAGE_EDITABLE" = yes ]; then
 
     if [ "$SAGE_WHEELS" = yes ]; then
         # Additionally build a wheel (for use in other venvs)
-        cd $SAGE_PKGS/sagelib/src && time sdh_setup_bdist_wheel && sdh_store_wheel .
+        cd $SAGE_PKGS/sagelib/src && time python3 -m build --no-isolation --wheel --skip-dependency-check -Csetup-args="--native-file=$(pwd)/sage-cython-native-file.ini" . && sdh_store_wheel .
     fi
 else
     # Make sure that an installed old version of sagelib in which sage is an ordinary package
@@ -69,7 +76,7 @@ else
     if [ "$SAGE_WHEELS" = yes ]; then
         # Use --no-build-isolation to avoid rebuilds because of dependencies:
         # 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 .
+        time sdh_pip_install --no-build-isolation -Csetup-args="--native-file=$(pwd)/sage-cython-native-file.ini" .
     else
         SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+="mcqd,tdlib,coxeter3,sirocco,meataxe,bliss"
         time python3 -u setup.py --no-user-cfg build install || exit 1

diff --git a/build/pkgs/sagemath_categories/dependencies b/build/pkgs/sagemath_categories/dependencies
@@ -1 +1 @@
- sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
+ sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build meson_python $(PYTHON)
diff --git a/build/pkgs/sagemath_objects/dependencies b/build/pkgs/sagemath_objects/dependencies
@@ -1,3 +1,3 @@
-FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
+FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build meson_python $(PYTHON)
 
 # FORCE: Always run the spkg-install script
diff --git a/build/pkgs/sagemath_objects/spkg-install.in b/build/pkgs/sagemath_objects/spkg-install.in
@@ -1,14 +1,18 @@
 cd src
 
+# For meson
+export CXXFLAGS="$CXXFLAGS $(echo "$CXX" | sed -En "s/.*(-std=[a-z0-9+]*).*/\1/p")"
+export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g')
+export CYTHON=sage-cython
+export CYTHON_FOR_BUILD=sage-cython
+
+
 export PIP_NO_INDEX=true
 export PIP_FIND_LINKS="file://$SAGE_SPKG_WHEELS"
 
-# First build the sdist, then build the wheel from the sdist.
-# https://pypa-build.readthedocs.io/en/latest/#python--m-build
-# (Important because sagemath-objects uses MANIFEST.in for filtering.)
 # Do not install the wheel.
 DIST_DIR="$(mktemp -d)"
-python3 -m build --outdir "$DIST_DIR"/dist . || sdh_die "Failure building sdist and wheel"
+python3 -m build --no-isolation --wheel --skip-dependency-check -Csetup-args="--native-file=$(pwd)/sage-cython-native-file.ini" --outdir "$DIST_DIR"/dist . || sdh_die "Failure building sdist and wheel"
 
 wheel=$(cd "$DIST_DIR" && sdh_store_wheel . >&2 && echo $wheel)
 ls -l "$wheel"
diff --git a/pkgs/sage-setup/pyproject.toml b/pkgs/sage-setup/pyproject.toml
@@ -33,12 +33,16 @@ content-type = "text/x-rst"
 [project.optional-dependencies]
 autogen = ["jinja2"]
 
+[project.scripts]
+sage-generate-meson = "sage_setup.autogen.meson:generate_meson"
+
 [tool.setuptools]
 packages = [
     "sage_setup",
     "sage_setup.autogen",
     "sage_setup.autogen.interpreters",
     "sage_setup.autogen.interpreters.specs",
+    "sage_setup.autogen.meson",
     "sage_setup.command",
 ]
 include-package-data = false

diff --git a/pkgs/sagemath-categories/meson.build b/pkgs/sagemath-categories/meson.build
@@ -0,0 +1,21 @@
+project(
+  'sagemath-categories',
+  ['c', 'cpp', 'cython'],
+  version: files('VERSION.txt'),
+  meson_version: '>= 1.2.0',
+)
+
+set_variable('distribution_sagemath_categories', true)
+
+# Python module
+# https://mesonbuild.com/Python-module.html
+py_module = import('python')
+py = py_module.find_installation(pure: false)
+py_dep = py.dependency()
+
+# Compilers
+cc = meson.get_compiler('c')
+cpp = meson.get_compiler('cpp')
+cython = meson.get_compiler('cython')
+
+subdir('sage')
diff --git a/pkgs/sagemath-categories/pyproject.toml.m4 b/pkgs/sagemath-categories/pyproject.toml.m4
@@ -2,8 +2,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
-    SPKG_INSTALL_REQUIRES_wheel
+    SPKG_INSTALL_REQUIRES_meson_python
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_sagemath_objects
@@ -12,7 +11,7 @@ requires = [
     SPKG_INSTALL_REQUIRES_cysignals
     SPKG_INSTALL_REQUIRES_pkgconfig
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "mesonpy"
 
 [project]
 name = "sagemath-categories"

diff --git a/pkgs/sagemath-categories/sage-cython-native-file.ini b/pkgs/sagemath-categories/sage-cython-native-file.ini
@@ -0,0 +1 @@
+../sagemath-objects/sage-cython-native-file.ini
diff --git a/pkgs/sagemath-environment/pyproject.toml.m4 b/pkgs/sagemath-environment/pyproject.toml.m4
@@ -50,6 +50,9 @@ script-files = [
     "bin/sage-version.sh",
     # Auxiliary script for invoking Python in the Sage environment
     "bin/sage-python",
+    # The following is freshly un-deprecated as a temporary workaround
+    # for defects in Cython 3.0.x support for PEP 420 implicit namespace packages
+    "bin/sage-cython",
     # Not included:
     # - bin/sage-env-config                  -- installed by sage_conf
     # - bin/sage-env-config.in               -- not to be installed

diff --git a/pkgs/sagemath-objects/meson.build b/pkgs/sagemath-objects/meson.build
@@ -0,0 +1,21 @@
+project(
+  'sagemath-objects',
+  ['c', 'cpp', 'cython'],
+  version: files('VERSION.txt'),
+  meson_version: '>= 1.2.0',
+)
+
+set_variable('distribution_sagemath_objects', true)
+
+# Python module
+# https://mesonbuild.com/Python-module.html
+py_module = import('python')
+py = py_module.find_installation(pure: false)
+py_dep = py.dependency()
+
+# Compilers
+cc = meson.get_compiler('c')
+cpp = meson.get_compiler('cpp')
+cython = meson.get_compiler('cython')
+
+subdir('sage')
diff --git a/pkgs/sagemath-objects/pyproject.toml.m4 b/pkgs/sagemath-objects/pyproject.toml.m4
@@ -2,16 +2,15 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    SPKG_INSTALL_REQUIRES_setuptools
-    SPKG_INSTALL_REQUIRES_wheel
+    SPKG_INSTALL_REQUIRES_meson_python
     SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
     SPKG_INSTALL_REQUIRES_gmpy2
     SPKG_INSTALL_REQUIRES_cysignals
     SPKG_INSTALL_REQUIRES_pkgconfig
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "mesonpy"
 
 [project]
 name = "sagemath-objects"

diff --git a/pkgs/sagemath-objects/sage-cython-native-file.ini b/pkgs/sagemath-objects/sage-cython-native-file.ini
@@ -0,0 +1,2 @@
+[binaries]
+cython = 'sage-cython'
diff --git a/pkgs/sagemath-standard/meson.build b/pkgs/sagemath-standard/meson.build
@@ -0,0 +1,50 @@
+project(
+  'sagemath-standard',
+  ['c', 'cpp', 'cython'],
+  version: files('VERSION.txt'),
+  meson_version: '>= 1.2.0',
+)
+
+# same list in setup.py
+set_variable('distribution_', true)  # catch-all
+set_variable('distribution_sagemath_objects', true)
+set_variable('distribution_sagemath_brial', true)
+set_variable('distribution_sagemath_categories', true)
+set_variable('distribution_sagemath_combinat', true)
+set_variable('distribution_sagemath_eclib', true)
+set_variable('distribution_sagemath_environment', true)
+set_variable('distribution_sagemath_flint', true)
+set_variable('distribution_sagemath_gap', true)
+set_variable('distribution_sagemath_giac', true)
+set_variable('distribution_sagemath_glpk', true)
+set_variable('distribution_sagemath_graphs', true)
+set_variable('distribution_sagemath_groups', true)
+set_variable('distribution_sagemath_homfly', true)
+set_variable('distribution_sagemath_lcalc', true)
+set_variable('distribution_sagemath_libbraiding', true)
+set_variable('distribution_sagemath_libecm', true)
+set_variable('distribution_sagemath_linbox', true)
+set_variable('distribution_sagemath_modules', true)
+set_variable('distribution_sagemath_mpmath', true)
+set_variable('distribution_sagemath_ntl', true)
+set_variable('distribution_sagemath_objects', true)
+set_variable('distribution_sagemath_pari', true)
+set_variable('distribution_sagemath_plot', true)
+set_variable('distribution_sagemath_polyhedra', true)
+set_variable('distribution_sagemath_repl', true)
+set_variable('distribution_sagemath_schemes', true)
+set_variable('distribution_sagemath_singular', true)
+set_variable('distribution_sagemath_symbolics', true)
+
+# Python module
+# https://mesonbuild.com/Python-module.html
+py_module = import('python')
+py = py_module.find_installation(pure: false)
+py_dep = py.dependency()
+
+# Compilers
+cc = meson.get_compiler('c')
+cpp = meson.get_compiler('cpp')
+cython = meson.get_compiler('cython')
+
+subdir('sage')
diff --git a/pkgs/sagemath-standard/pyproject-monolithic.toml b/pkgs/sagemath-standard/pyproject-monolithic.toml
@@ -0,0 +1 @@
+../../src/pyproject.toml
diff --git a/pkgs/sagemath-standard/pyproject-monolithic.toml.m4 b/pkgs/sagemath-standard/pyproject-monolithic.toml.m4
@@ -0,0 +1 @@
+../../src/pyproject.toml.m4
diff --git a/pkgs/sagemath-standard/pyproject.toml b/pkgs/sagemath-standard/pyproject.toml