Remove direct use of "setup.py sdist", add targets "make SPKG-sdist"

Makefile

@@ -80,42 +80,6 @@ download:
 dist: build/make/Makefile
  ./sage --sdist
 
-pypi-sdists: sage_setup
- ./sage --sh build/pkgs/sage_conf/spkg-src
- ./sage --sh build/pkgs/sage_sws2rst/spkg-src
- ./sage --sh build/pkgs/sage_docbuild/spkg-src
- ./sage --sh build/pkgs/sage_setup/spkg-src
- ./sage --sh build/pkgs/sagelib/spkg-src
- ./sage --sh build/pkgs/sagemath_objects/spkg-src
- ./sage --sh build/pkgs/sagemath_categories/spkg-src
- ./sage --sh build/pkgs/sagemath_environment/spkg-src
- ./sage --sh build/pkgs/sagemath_repl/spkg-src
- @echo "Built sdists are in upstream/"
-
-# Ensuring wheels are present, even for packages that may have been installed
-# as editable. Until we have better uninstallation of script packages, we
-# just remove the timestamps, which will lead to rebuilds of the packages.
-PYPI_WHEEL_PACKAGES = sage_sws2rst sage_setup sagemath_environment sagemath_objects sagemath_repl sagemath_categories
-pypi-wheels:
- for a in $(PYPI_WHEEL_PACKAGES); do \
- rm -f venv/var/lib/sage/installed/$$a-*; \
- done
- for a in $(PYPI_WHEEL_PACKAGES); do \
- $(MAKE) SAGE_EDITABLE=no SAGE_WHEELS=yes $$a; \
- done
- @echo "Built wheels are in venv/var/lib/sage/wheels/"
-
-# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
-WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) sage_conf sagelib sage_docbuild
-wheels:
- for a in $(WHEEL_PACKAGES); do \
- rm -f venv/var/lib/sage/installed/$$a-*; \
- done
- for a in $(WHEEL_PACKAGES); do \
- $(MAKE) SAGE_EDITABLE=no SAGE_WHEELS=yes $$a; \
- done
- @echo "Built wheels are in venv/var/lib/sage/wheels/"
-
 ###############################################################################
 # Cleaning up
 ###############################################################################
@@ -380,7 +344,6 @@ list:
  @$(MAKE) --silent -f build/make/Makefile SAGE_PKGCONFIG=dummy $@
 
 .PHONY: default build dist install micro_release \
- pypi-sdists pypi-wheels wheels \
  misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
  test check testoptional testall testlong testoptionallong testallong \
  ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \

build/make/Makefile.in

@@ -128,7 +128,23 @@ PIP_PACKAGES = @SAGE_PIP_PACKAGES@
 # Packages that use the 'script' package build rules
 SCRIPT_PACKAGES = @SAGE_SCRIPT_PACKAGES@
 
-
+# Packages for which we build wheels for PyPI
+PYPI_WHEEL_PACKAGES = \
+ sage_sws2rst \
+ sage_setup \
+ sagemath_environment \
+ sagemath_objects \
+ sagemath_repl \
+ sagemath_categories
+
+# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
+WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \
+ sage_conf \
+ sagelib \
+ sage_docbuild
+
+# Packages for which build sdists for PyPI
+PYPI_SDIST_PACKAGES = $(WHEEL_PACKAGES)
 
 # Generate the actual inst_<pkgname> variables; for each package that is
 # actually built this generates a line like:
@@ -198,6 +214,7 @@ SAGE_I_TARGETS = sagelib doc
 # Tell make not to look for files with these names:
 .PHONY: all all-sage all-toolchain all-build all-sageruntime \
  all-start build-start base toolchain toolchain-deps base-toolchain \
+ pypi-sdists pypi-wheels wheels \
  sagelib \
  doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
  doc-uninstall \
@@ -418,6 +435,25 @@ list-broken-packages: auditwheel_or_delocate
  echo >&2 "$$fix_broken_packages"; \
  fi
 
+pypi-sdists: $(PYPI_SDIST_PACKAGES:%=%-sdist)
+ @echo "Built sdists are in upstream/"
+
+# Ensuring wheels are present, even for packages that may have been installed
+# as editable. Until we have better uninstallation of script packages, we
+# just remove the timestamps, which will lead to rebuilds of the packages.
+pypi-wheels:
+ for a in $(PYPI_WHEEL_PACKAGES); do \
+ rm -f $(SAGE_VENV)/var/lib/sage/installed/$$a-*; \
+ done
+ $(MAKE_REC) SAGE_EDITABLE=no SAGE_WHEELS=yes $(PYPI_WHEEL_PACKAGES)
+ @echo "Built wheels are in venv/var/lib/sage/wheels/"
+
+wheels:
+ for a in $(WHEEL_PACKAGES); do \
+ rm -f $(SAGE_VENV)/var/lib/sage/installed/$$a-*; \
+ done
+ $(MAKE_REC) SAGE_EDITABLE=no SAGE_WHEELS=yes $(WHEEL_PACKAGES)
+ @echo "Built wheels are in venv/var/lib/sage/wheels/"
 
 #==============================================================================
 # Setting SAGE_CHECK... variables
@@ -711,6 +747,13 @@ $(1)-uninstall: $(1)-$(4)-uninstall
 
 $(1)-clean: $(1)-uninstall
 
+$(1)-sdist: FORCE python_build sage_setup cython
+ $(AM_V_at) cd '$$(SAGE_ROOT)' && \
+ . '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
+ . '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
+ . '$$(SAGE_ROOT)/src/bin/sage-env' && \
+ '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-src'
+
 # Recursive tox invocation (note - we do not set the environment here).
 # Setting SAGE_SPKG_WHEELS is for the benefit of sagelib's tox.ini
 $(1)-tox-%: FORCE

build/pkgs/sage_conf/spkg-src

@@ -16,4 +16,7 @@ fi
 set -e
 
 cd pkgs/sage-conf_pypi
-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"

build/pkgs/sage_docbuild/spkg-src

@@ -18,4 +18,7 @@ set -e
 cd build/pkgs/sage_docbuild
 
 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"

build/pkgs/sage_setup/spkg-src

@@ -18,4 +18,7 @@ set -e
 cd build/pkgs/sage_setup
 
 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"

build/pkgs/sage_sws2rst/spkg-install

@@ -18,6 +18,7 @@ if [ "$SAGE_EDITABLE" = yes ]; then
 else
  sdh_pip_install .
 fi
+cd ..
 # For type=script packages, spkg-check is not run
 case "$SAGE_CHECK" in
  yes)

build/pkgs/sage_sws2rst/spkg-src

@@ -18,4 +18,7 @@ set -e
 cd build/pkgs/sage_sws2rst
 
 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"

build/pkgs/sagelib/spkg-src

@@ -4,7 +4,7 @@
 # This script is not used during build.
 #
 # HOW TO MAKE THE TARBALL:
-# ./sage --sh build/pkgs/sagelib/spkg-src
+# make python_build && ./sage --sh build/pkgs/sagelib/spkg-src
 
 if [ -z "$SAGE_ROOT" ] ; then
  echo >&2 "Error - SAGE_ROOT undefined ... exiting"
@@ -18,4 +18,8 @@ set -e
 cd "$SAGE_ROOT"/build/pkgs/sagelib
 
 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"

build/pkgs/sagemath_categories/spkg-src

@@ -18,4 +18,7 @@ set -e
 cd build/pkgs/sagemath_categories
 
 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"

build/pkgs/sagemath_environment/spkg-src

@@ -18,4 +18,7 @@ set -e
 cd build/pkgs/sagemath_environment
 
 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"

build/pkgs/sagemath_objects/spkg-src

@@ -18,4 +18,8 @@ set -e
 cd build/pkgs/sagemath_objects
 
 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"

build/pkgs/sagemath_repl/spkg-src

@@ -18,4 +18,7 @@ set -e
 cd build/pkgs/sagemath_repl
 
 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"