Skip to content

Commit e0589c3

Browse files
author
Matthias Koeppe
committed
build/bin/sage-get-system-packages: When scanning pyproject.toml for package names, treat dashes and underscores as equivalent
1 parent e984631 commit e0589c3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build/bin/sage-get-system-packages

+3-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ for PKG_BASE in $SPKGS; do
106106
# - from "[project] dependencies",
107107
# - from "[project.optional-dependencies]"
108108
# Packages are in the format "'sage-conf ~= 10.3b3',"
109-
PACKAGE_INFO=$(sed -n '/\(requires\|dependencies\|R\) *= *\[/,/^\]/s/^ *'\''\('$PKG_BASE'.*\)'\'',/\1/p' "$SAGE_ROOT/src/pyproject.toml")
109+
# Accept dashes and underscores in package names as equivalent:
110+
PKG_REGEX=$(echo $PKG_BASE | sed 's/[-_]/[-_]/g')
111+
PACKAGE_INFO=$(sed -En '/(requires|dependencies|R) *= *\[/,/^\]/s/^ *'\''('$PKG_REGEX'.*)'\'',/\1/p' "$SAGE_ROOT/src/pyproject.toml")
110112
if [ -n "$PACKAGE_INFO" ]; then
111113
echo "$PACKAGE_INFO" | ${STRIP_COMMENTS}
112114
[ $SYSTEM = versions ] || break

0 commit comments

Comments
 (0)