Use meson in sage-the-distro

.ci/write-dockerfile.sh

@@ -275,20 +275,20 @@ cat <<EOF
 FROM with-system-packages AS bootstrapped
 #:bootstrapping:
 RUN rm -rf /new /sage/.git
-$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
+$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore pyproject.toml meson.build /new/
 $ADD config/config.rpath /new/config/config.rpath
 $ADD src/doc/bootstrap /new/src/doc/bootstrap
+$ADD src/meson.build /new/src/
 $ADD src/bin /new/src/bin
-$ADD src/pyproject.toml src/requirements.txt.m4 src/setup.cfg.m4 src/VERSION.txt /new/src/
 $ADD m4 /new/m4
 $ADD pkgs /new/pkgs
 $ADD build /new/build
 $ADD .upstream.d /new/.upstream.d
 ADD .ci /.ci
 RUN if [ -d /sage ]; then \\
         echo "### Incremental build from \$(cat /sage/VERSION.txt)" && \\
-        printf '/src/*\n!/src/doc/bootstrap\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/src/VERSION.txt\n' >> /sage/.gitignore && \\
-        printf '/src/*\n!/src/doc/bootstrap\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/src/VERSION.txt\n' >> /new/.gitignore && \\
+        printf '/src/*\n!/src/doc/bootstrap\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/VERSION.txt\n' >> /sage/.gitignore && \\
+        printf '/src/*\n!/src/doc/bootstrap\n!/src/bin\n!/src/*.m4\n!/src/*.toml\n!/VERSION.txt\n' >> /new/.gitignore && \\
         if ! (cd /new && /.ci/retrofit-worktree.sh worktree-image /sage); then \\
             echo "retrofit-worktree.sh failed, falling back to replacing /sage"; \\
             for a in local logs; do \\

.github/workflows/doc-build.yml

@@ -165,7 +165,7 @@ jobs:
             mathjax_path_from="[-./A-Za-z_]*/tex-chtml[.]js?v=[0-9a-f]*"
             # mathjax path in new doc
             mathjax_path_to=$(docker exec -e SAGE_USE_CDNS=yes BUILD /sage/sage -python -c "from sage_docbuild.conf import mathjax_path; print(mathjax_path)")
-            new_version=$(docker exec BUILD cat src/VERSION.txt)
+            new_version=$(docker exec BUILD cat VERSION.txt)
             # Wipe out chronic diffs between old doc and new doc
             (cd doc && \
              find . -name "*.html" | xargs sed -i -e '/class="sidebar-brand-text"/ s/Sage [0-9a-z.]* /Sage '"$new_version"' /' \

Makefile

@@ -350,7 +350,7 @@ ptestoptionallong-nodoc:
 # CONFIGURE_DEPENDENCIES is the list of files that influence the generation of 'configure'.
 CONFIGURE_DEPENDENCIES =							\
 	configure.ac src/bin/sage-version.sh m4/*.m4				\
-	src/pyproject.toml							\
+	pyproject.toml							\
 	build/pkgs/*/spkg-configure.m4						\
 	build/pkgs/*/type build/pkgs/*/SPKG.rst					\
 	build/pkgs/*/checksums.ini build/pkgs/*/requirements.txt		\

README.md

@@ -533,12 +533,8 @@ SAGE_ROOT                 Root directory (create by git clone)
 │   ├── sage-setup
 │   │   ├── sage_setup/
 │   │   └── setup.py
-│   ├── sage-sws2rst
-│   │   ├── sage_sws2rst/
-│   │   └── setup.py
-│   └── sagemath-standard
-│       ├── bin/
-│       ├── sage -> ../../src/sage
+│   └── sage-sws2rst
+│       ├── sage_sws2rst/
 │       └── setup.py
 ├── local  (SAGE_LOCAL)   Installation hierarchy for non-Python packages
 │   ├── bin               Executables

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.6.beta1, Release Date: 2024-12-15
+10.6.beta1

build/pkgs/sage_conf/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sage_docbuild/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sage_numerical_backends_coin/package-version.txt

@@ -0,0 +1 @@
+../../../VERSION.txt

build/pkgs/sage_numerical_backends_cplex/package-version.txt

@@ -0,0 +1 @@
+../../../VERSION.txt

build/pkgs/sage_numerical_backends_gurobi/package-version.txt

@@ -0,0 +1 @@
+../../../VERSION.txt

build/pkgs/sage_setup/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sage_sws2rst/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagelib/dependencies

@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran
+FORCE $(SCRIPTS) boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) meson_python $(PYTHON) pythran
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/sagelib/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagelib/spkg-install.in

@@ -1,15 +1,14 @@
 if [ "$SAGE_EDITABLE" = yes ]; then
-    cd "$SAGE_SRC"
+    cd $SAGE_ROOT
 else
-    cd src
+    cd $SAGE_ROOT
     # Issue #34181: Do not allow scripts with shebang lines from old
     # venvs leak into new venvs. (Changes only seem to be necessary
     # for non-editable builds.)
     rm -rf build/scripts-*
 fi
-## All sagelib-building is done by setup.py.
-## This is so that sagelib can be installed by standard Python procedures,
-## such as "./setup.py install" or "pip install ."
+## All sagelib-building is using standard Python procedures,
+## such as "pip install ."
 ##
 ## We poison all environment variables that have paths to the sage source and build directories.
 ## In this way we make sure that all of the sagelib build's source paths are communicated through
@@ -71,3 +70,6 @@ python3 -c 'import pathlib; from sage.misc.lazy_import_cache import get_cache_fi
 # Issue #33103: The temp.* directories are large after a full build.
 # We remove them to save space; they are not needed for fast rebuilds.
 rm -rf build/temp.*
+
+# indicate that we are done - is needed to allow ./sage to start
+touch $SAGE_VENV/bin/sage

build/pkgs/sagemath_bliss/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_categories/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_coxeter3/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_environment/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_mcqd/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_meataxe/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_objects/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_repl/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_sirocco/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

build/pkgs/sagemath_tdlib/package-version.txt

@@ -1 +1 @@
-src/VERSION.txt
+../../../VERSION.txt

m4/sage_check_python_for_venv.m4

@@ -195,7 +195,7 @@ from $distutils_extension import Extension
 from sys import exit
 modules = list((Extension("config_check_distutils_cxx", list(("conftest.cpp",)),
                           extra_compile_args=list(("-std=c++11",)), language="c++"),))
-setup(name="config_check_distutils_cxx", ext_modules=modules)
+setup(name="config_check_distutils_cxx", ext_modules=modules, py_modules=["conftest"])
 exit(0)
 EOF
 ])