Remove references to removed files

Author: tobiasdiez

Makefile

@@ -175,8 +175,6 @@ bootstrap-clean:
 	rm -f src/doc/en/installation/*.txt
 	find src/doc/en/reference/spkg -maxdepth 1 -name index.rst -prune -o -name "*.rst" -exec rm -f {} \+
 	for a in environment environment-optional src/environment src/environment-optional; do rm -f $$a.yml $$a-3.[89].yml $$a-3.1[0-9].yml; done
-	rm -f src/requirements.txt
-	rm -f src/setup.cfg
 	rm -f build/pkgs/cypari/version_requirements.txt
 	rm -f build/pkgs/cysignals/version_requirements.txt
 	rm -f build/pkgs/cython/version_requirements.txt

bootstrap

@@ -39,7 +39,7 @@ bootstrap () {
         if [ "${BOOTSTRAP_QUIET}" = "no" ]; then
             echo "bootstrap:$LINENO: installing '"$target"'"
         fi
-        echo "# Generated by SAGE_ROOT/bootstrap based on src/pyproject.toml; do not edit directly" > $target
+        echo "# Generated by SAGE_ROOT/bootstrap based on pyproject.toml; do not edit directly" > $target
         sage-get-system-packages install-requires ${pkgname} >> $target
     done
     for a in m4/sage_spkg_configures.m4 m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
@@ -228,16 +228,14 @@ save () {
 	src/doc/en/installation/*.txt \
 	$(find src/doc/en/reference/spkg -maxdepth 1 -name index.rst -prune -o -name "*.rst" -print) \
 	environment-3.1[0-9]-*.yml \
-	src/pyproject.toml \
-	src/requirements.txt \
-	src/setup.cfg \
+	pyproject.toml \
 	build/pkgs/cypari/version_requirements.txt \
 	build/pkgs/cysignals/version_requirements.txt \
 	build/pkgs/cython/version_requirements.txt \
 	build/pkgs/gmpy2/version_requirements.txt \
 	build/pkgs/jupyter_core/version_requirements.txt \
 	build/pkgs/memory_allocator/version_requirements.txt \
-        build/pkgs/meson/version_requirements.txt \
+    build/pkgs/meson/version_requirements.txt \
 	build/pkgs/numpy/version_requirements.txt \
 	build/pkgs/pkgconfig/version_requirements.txt \
 	build/pkgs/pplpy/version_requirements.txt \

build/bin/sage-get-system-packages

@@ -14,29 +14,29 @@ fi
 
 case "$SYSTEM" in
     install-requires)
-        # Collect from src/pyproject.toml or from version_requirements.txt (falling back to requirements.txt) and output it in the format
+        # Collect from pyproject.toml or from version_requirements.txt (falling back to requirements.txt) and output it in the format
         # needed by setup.cfg [options] install_requires=
-        SYSTEM_PACKAGES_FILE_NAMES="src/pyproject.toml version_requirements.txt requirements.txt"
+        SYSTEM_PACKAGES_FILE_NAMES="pyproject.toml version_requirements.txt requirements.txt"
         # also normalizes quotes from "" to ''.
         STRIP_COMMENTS="sed s/#.*//;/^[[:space:]]*$/d;s/\"/'/g;"
         COLLECT=
         ;;
     install-requires-toml)
-        # Collect from src/pyproject.toml or from version_requirements.txt (falling back to requirements.txt) and output it in the format
+        # Collect from pyproject.toml or from version_requirements.txt (falling back to requirements.txt) and output it in the format
         # needed by pyproject.toml [build-system] requires=
-        SYSTEM_PACKAGES_FILE_NAMES="src/pyproject.toml version_requirements.txt requirements.txt"
+        SYSTEM_PACKAGES_FILE_NAMES="pyproject.toml version_requirements.txt requirements.txt"
         # also normalizes quotes from '' to "".
         STRIP_COMMENTS="sed s/#.*//;/^[[:space:]]*$/d;s/'/\"/g;s/^/'/;s/$/',/;"
         COLLECT=
         ;;
     pip)
-        SYSTEM_PACKAGES_FILE_NAMES="requirements.txt src/pyproject.toml version_requirements.txt"
+        SYSTEM_PACKAGES_FILE_NAMES="requirements.txt pyproject.toml version_requirements.txt"
         STRIP_COMMENTS='sed s/#.*//;s/[[:space:]]//g;'
         COLLECT=echo
         ;;
     versions)
         # For use in sage-spkg-info
-        SYSTEM_PACKAGES_FILE_NAMES="package-version.txt requirements.txt src/pyproject.toml version_requirements.txt"
+        SYSTEM_PACKAGES_FILE_NAMES="package-version.txt requirements.txt pyproject.toml version_requirements.txt"
         strip_comments () {
             TEXT=$(sed "s/#.*//;/^[[:space:]]*$/d;s/\"/'/g;s/^/    /;" "$@")
             if [ -n "$(echo $TEXT)" ]; then
@@ -101,9 +101,9 @@ for PKG_BASE in $SPKGS; do
             *pyproject.toml)
                 SYSTEM_PACKAGES_FILE="$SAGE_ROOT"/$NAME
                 if [ -f "$SYSTEM_PACKAGES_FILE" ]; then
-                    # Extract from the "requires" block in src/pyproject.toml
+                    # Extract from the "requires" block in pyproject.toml
                     # Packages are in the format "'sage-conf ~= 10.3b3',"
-                    PACKAGE_INFO=$(sed -n '/requires *= *\[/,/^\]/s/^ *'\''\('$PKG_BASE'.*\)'\'',/\1/p' "$SAGE_ROOT/src/pyproject.toml")
+                    PACKAGE_INFO=$(sed -n '/requires *= *\[/,/^\]/s/^ *'\''\('$PKG_BASE'.*\)'\'',/\1/p' "$SAGE_ROOT/pyproject.toml")
                     if [ -n "$PACKAGE_INFO" ]; then
                         echo "$PACKAGE_INFO" | ${STRIP_COMMENTS}
                         [ $SYSTEM = versions ] || break

m4/sage_python_package_check.m4

@@ -8,7 +8,7 @@
 #   Determine if the system copy of a python package can be used by sage.
 #
 #   This macro uses setuptools.version's pkg_resources to check that the
-#   "version_requirements.txt" file (or entry in "src/pyproject.toml") for
+#   "version_requirements.txt" file (or entry in "pyproject.toml") for
 #   the named package is satisfied, and it can typically fail in four ways:
 #
 #     1. If --enable-system-site-packages was not passed to ./configure,
@@ -20,7 +20,7 @@
 #     4. If setuptools is not available to the system python,
 #
 #     5. If the contents of version_requirements.txt (or entry in
-#        "src/pyproject.toml") are not met (wrong version, no version,
+#        "pyproject.toml") are not met (wrong version, no version,
 #        etc.) by the system python.
 #
 #   In any of those cases, we set sage_spkg_install_$package to "yes"