Skip to content

Commit 3b884b6

Browse files
committed
COMP: Whitelist manylinux Python versions
Avoid recently added 2.6 Python versions added to the manylinux Docker image.
1 parent fd80ebb commit 3b884b6

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

scripts/dockcross-manylinux-build-module-wheels.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ script_dir=$(cd $(dirname $0) || exit 1; pwd)
2222

2323
# Build wheels
2424
mkdir -p dist
25-
DOCKER_ARGS="-v $(pwd)/dist:/work/dist/ -v "$script_dir/..":/ITKPythonPackage -v $(pwd}/tools:/tools"
25+
DOCKER_ARGS="-v $(pwd)/dist:/work/dist/ -v "$script_dir/..":/ITKPythonPackage -v $(pwd)/tools:/tools"
2626
/tmp/dockcross-manylinux-x64 \
2727
-a "$DOCKER_ARGS" \
2828
"/ITKPythonPackage/scripts/internal/manylinux-build-module-wheels.sh" "$@"
2929
#/tmp/dockcross-manylinux-x86 \
3030
# -a "$DOCKER_ARGS" \
31-
# "$script_dir/scripts/internal/manylinux-build-module-wheels.sh" "$@"
31+
# "/ITKPythonPackage/scripts/internal/manylinux-build-module-wheels.sh" "$@"

scripts/internal/manylinux-build-common.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ set -e -x
77
# For example,
88
# manylinux-build-wheels.sh cp27mu cp35
99
if [[ $# -eq 0 ]]; then
10-
PYBINARIES=(/opt/python/*/bin)
10+
PYBIN=(/opt/python/*/bin)
11+
PYBINARIES=()
12+
for version in "${PYBIN[@]}"; do
13+
if [[ ${version} == *"cp27"* || ${version} == *"cp35"* || ${version} == *"cp36"* ]]; then
14+
PYBINARIES+=(${version})
15+
fi
16+
done
1117
else
1218
PYBINARIES=()
1319
for version in "$@"; do

scripts/internal/manylinux-build-module-wheels.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ source "${script_dir}/manylinux-build-common.sh"
1313

1414
# Compile wheels re-using standalone project and archive cache
1515
for PYBIN in "${PYBINARIES[@]}"; do
16-
if [[ ${PYBIN} == *"cp26"* || ${PYBIN} == *"cp33"* || ${PYBIN} == *"cp34"* || ${PYBIN} == *"cpython-2.6"* ]]; then
17-
echo "Skipping ${PYBIN}"
18-
continue
19-
fi
20-
2116
PYTHON_EXECUTABLE=${PYBIN}/python
2217
PYTHON_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
2318

scripts/internal/manylinux-build-wheels.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ SINGLE_WHEEL=0
2828

2929
# Compile wheels re-using standalone project and archive cache
3030
for PYBIN in "${PYBINARIES[@]}"; do
31-
if [[ ${PYBIN} == *"cp26"* || ${PYBIN} == *"cp33"* ]]; then
32-
echo "Skipping ${PYBIN}"
33-
continue
34-
fi
35-
3631
PYTHON_EXECUTABLE=${PYBIN}/python
3732
PYTHON_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
3833

@@ -148,10 +143,6 @@ done
148143

149144
# Install packages and test
150145
for PYBIN in "${PYBINARIES[@]}"; do
151-
if [[ ${PYBIN} == *"cp26"* || ${PYBIN} == *"cp33"* ]]; then
152-
echo "Skipping ${PYBIN}"
153-
continue
154-
fi
155146
${PYBIN}/pip install numpy
156147
${PYBIN}/pip install itk --no-cache-dir --no-index -f /work/dist
157148
(cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')

0 commit comments

Comments
 (0)