Skip to content

Commit 235ce91

Browse files
author
Matthias Koeppe
committed
bootstrap-conda: Only one 'python' line + speed up
1 parent b02ef8e commit 235ce91

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

bootstrap-conda

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,53 +81,52 @@ unset ENABLE_SYSTEM_SITE_PACKAGES
8181
[ -n "$BOOTSTRAP_VERBOSE" ] && echo "## Translated to system:" && set | grep SYSTEM_PACKAGES=
8282

8383
echo >&2 $0:$LINENO: generate conda environment files
84-
for python_version in 3.9 3.10 3.11; do
84+
8585
(
8686
echo "name: sage-build"
8787
echo "channels:"
8888
echo " - conda-forge"
8989
echo " - nodefaults"
9090
echo "dependencies:"
91-
echo " - python=$python_version"
9291
for pkg in $SYSTEM_PACKAGES; do
9392
echo " - $pkg"
9493
done
9594
echo " # Packages needed for ./bootstrap"
9695
for pkg in $BOOTSTRAP_SYSTEM_PACKAGES; do
9796
echo " - $pkg"
9897
done
99-
) > environment-$python_version.yml
98+
) > environment-template.yml
10099
(
101-
sed 's/name: sage-build/name: sage/' environment-$python_version.yml
100+
sed 's/name: sage-build/name: sage/' environment-template.yml
102101
echo " # Additional packages providing all dependencies for the Sage library"
103102
for pkg in $SAGELIB_SYSTEM_PACKAGES; do
104103
echo " - $pkg"
105104
done
106-
) > src/environment-$python_version.yml
105+
) > src/environment-template.yml
107106

108107
(
109-
cat environment-$python_version.yml
108+
cat environment-template.yml
110109
echo " # optional packages"
111110
for pkg in $OPTIONAL_SYSTEM_PACKAGES; do
112111
echo " - $pkg"
113112
done
114-
) > environment-optional-$python_version.yml
113+
) > environment-optional-template.yml
115114

116115
(
117-
sed 's/name: sage/name: sage-dev/' src/environment-$python_version.yml
116+
sed 's/name: sage/name: sage-dev/' src/environment-template.yml
118117
echo " # Additional dev tools"
119118
for pkg in $DEVELOP_SYSTEM_PACKAGES; do
120119
echo " - $pkg"
121120
done
122-
) > src/environment-dev-$python_version.yml
121+
) > src/environment-dev-template.yml
123122

124123
(
125-
cat src/environment-$python_version.yml
124+
cat src/environment-template.yml
126125
echo " # optional packages"
127126
for pkg in $OPTIONAL_SYSTEM_PACKAGES $SAGELIB_OPTIONAL_SYSTEM_PACKAGES; do
128127
echo " - $pkg"
129128
done
130-
) > src/environment-optional-$python_version.yml
129+
) > src/environment-optional-template.yml
131130

132131
(
133132
echo >&4 " - pip:"
@@ -152,5 +151,11 @@ for python_version in 3.9 3.10 3.11; do
152151
done
153152
fi
154153
done
155-
) 4>> src/environment-dev-$python_version.yml 5>> src/environment-optional-$python_version.yml
154+
) 4>> src/environment-dev-template.yml 5>> src/environment-optional-template.yml
155+
156+
for f in environment environment-optional src/environment src/environment-optional src/environment-dev; do
157+
for python_version in 3.9 3.10 3.11; do
158+
sed -E 's/^( *- *)python *$/\1python='$python_version'/' $f-template.yml > $f-$python_version.yml
159+
done
160+
rm -f $f-template.yml
156161
done

0 commit comments

Comments
 (0)