build/bin/sage-get-system-packages: Extract from pyproject.toml [proj…

…ect] dependencies, [project.optional-dependencies] too
sagemath · Jun 12, 2024 · c9c5bd1 · c9c5bd1
1 parent c190c9e
commit c9c5bd1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/build/bin/sage-get-system-packages b/build/bin/sage-get-system-packages
@@ -102,9 +102,12 @@ 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 src/pyproject.toml:
+                    #  - from the "[build-system] requires" value
+                    #  - from "[project] dependencies",
+                    #  - from "[project.optional-dependencies]"
                     # 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\|dependencies\|R\) *= *\[/,/^\]/s/^ *'\''\('$PKG_BASE'.*\)'\'',/\1/p' "$SAGE_ROOT/src/pyproject.toml")
                     if [ -n "$PACKAGE_INFO" ]; then
                         echo "$PACKAGE_INFO" | ${STRIP_COMMENTS}
                         [ $SYSTEM = versions ] || break