Skip to content

Commit 8d9eed4

Browse files
jcfrthewtex
authored andcommitted
macpython/manylinux: Update tests to install expected wheels
Also update WHEEL_NAMES.txt to list packages in topological order
1 parent 1689c2e commit 8d9eed4

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

scripts/WHEEL_NAMES.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
itk-core
2-
itk-filtering
3-
itk-io
42
itk-numerics
3+
itk-io
4+
itk-filtering
55
itk-registration
66
itk-segmentation

scripts/internal/manylinux-build-wheels.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ pushd /work/standalone-${ARCH}-build > /dev/null 2>&1
1414
ninja
1515
popd > /dev/null 2>&1
1616

17+
SINGLE_WHEEL=0
18+
1719
# Compile wheels re-using standalone project and archive cache
1820
for PYBIN in "${PYBINARIES[@]}"; do
1921
if [[ ${PYBIN} == *"cp26"* || ${PYBIN} == *"cp33"* ]]; then
@@ -40,9 +42,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
4042
# Clean up previous invocations
4143
rm -rf ${build_path}
4244

43-
single_wheel=0
44-
45-
if [[ ${single_wheel} == 1 ]]; then
45+
if [[ ${SINGLE_WHEEL} == 1 ]]; then
4646

4747
echo "#"
4848
echo "# Build single ITK wheel"
@@ -133,7 +133,14 @@ for PYBIN in "${PYBINARIES[@]}"; do
133133
echo "Skipping ${PYBIN}"
134134
continue
135135
fi
136-
sudo ${PYBIN}/pip install itk --no-cache-dir --no-index -f /work/dist
136+
if [[ ${SINGLE_WHEEL} == 1 ]]; then
137+
packages="itk"
138+
else
139+
packages=$(cat ${script_dir}/../WHEEL_NAMES.txt)
140+
fi
141+
for package in ${packages}; do
142+
${PYBIN}/pip install ${package} --no-cache-dir --no-index -f /work/dist
143+
done
137144
sudo ${PYBIN}/pip install numpy
138145
(cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')
139146
(cd $HOME && ${PYBIN}/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')

scripts/macpython-build-wheels.sh

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ pushd standalone-build > /dev/null 2>&1
5050
$NINJA_EXECUTABLE
5151
popd > /dev/null 2>&1
5252

53+
SINGLE_WHEEL=0
54+
5355
# Compile wheels re-using standalone project and archive cache
5456
for VENV in "${VENVS[@]}"; do
5557
py_mm=$(basename ${VENV})
@@ -74,9 +76,7 @@ for VENV in "${VENVS[@]}"; do
7476
# Clean up previous invocations
7577
rm -rf ${build_path}
7678

77-
single_wheel=0
78-
79-
if [[ ${single_wheel} == 1 ]]; then
79+
if [[ ${SINGLE_WHEEL} == 1 ]]; then
8080

8181
echo "#"
8282
echo "# Build single ITK wheel"
@@ -162,7 +162,14 @@ $DELOCATE_WHEEL ${SCRIPT_DIR}/../dist/*.whl # copies library dependencies into w
162162

163163
# Install packages and test
164164
for VENV in "${VENVS[@]}"; do
165-
${VENV}/bin/pip install itk --no-cache-dir --no-index -f ${SCRIPT_DIR}/../dist
165+
if [[ ${SINGLE_WHEEL} == 1 ]]; then
166+
packages="itk"
167+
else
168+
packages=$(cat ${SCRIPT_DIR}/WHEEL_NAMES.txt)
169+
fi
170+
for package in ${packages}; do
171+
${VENV}/bin/pip install ${package} --no-cache-dir --no-index -f ${SCRIPT_DIR}/../dist
172+
done
166173
${VENV}/bin/pip install numpy
167174
(cd $HOME && ${VENV}/bin/python -c 'import itk;')
168175
(cd $HOME && ${VENV}/bin/python -c 'import itk; image = itk.Image[itk.UC, 2].New()')

0 commit comments

Comments
 (0)