build/pkgs/sagelib: Use python-build

sagemath · Oct 3, 2022 · 40fc2f6 · 40fc2f6
1 parent 7a0f88f
commit 40fc2f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies
@@ -1,4 +1,4 @@
-FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 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 pycygwin $(PYTHON) requests rw sage_conf sagemath_objects sagemath_categories sagemath_environment sagemath_repl singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml jinja2 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 pycygwin $(PYTHON) requests rw sage_conf sagemath_objects sagemath_categories sagemath_environment sagemath_repl singular symmetrica zn_poly $(PCFILES) | $(PYTHON_TOOLCHAIN) python_build sage_setup
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/sagelib/spkg-install b/build/pkgs/sagelib/spkg-install
@@ -75,9 +75,14 @@ else
     (cd "$SITEPACKAGESDIR" && rm -f sagemath-standard.egg-link)
 
     if [ "$SAGE_WHEELS" = yes ]; then
+        # 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.)
+        DIST_DIR="$(mktemp -d)"
         # 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 .
+        python3 -m build --no-isolation --outdir "$DIST_DIR"/dist . || sdh_die "Failure building sdist and wheel"
+        wheel=$(cd "$DIST_DIR" && sdh_store_and_pip_install_wheel . && echo $wheel)
     else
         time python3 -u setup.py --no-user-cfg build install || exit 1
     fi