File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -31,6 +31,10 @@ if(ITKPythonPackage_SUPERBUILD)
3131 list (APPEND ep_common_cmake_cache_args
3232 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET} )
3333 endif ()
34+ if (CMAKE_OSX_ARCHITECTURES)
35+ list (APPEND ep_common_cmake_cache_args
36+ -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES} )
37+ endif ()
3438
3539 #-----------------------------------------------------------------------------
3640 # compile with multiple processors
Original file line number Diff line number Diff line change @@ -78,10 +78,11 @@ for VENV in "${VENVS[@]}"; do
7878 echo " PYTHON_LIBRARY:${PYTHON_LIBRARY} "
7979
8080 $PYTHON_EXECUTABLE -m pip install -r ${SCRIPT_DIR} /../requirements-dev.txt
81- $PYTHON_EXECUTABLE setup.py bdist_wheel -G Ninja -- \
81+ $PYTHON_EXECUTABLE setup.py bdist_wheel --build-type MinSizeRel --plat-name macosx-10.6-x86_64 - G Ninja -- \
8282 -DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
8383 -DITK_SOURCE_DIR:PATH=${SCRIPT_DIR} /../standalone-build/ITK-source \
8484 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 \
85+ -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
8586 -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
8687 -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
8788 -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
@@ -93,7 +94,7 @@ $DELOCATE_WHEEL ${SCRIPT_DIR}/../dist/*.whl # copies library dependencies into w
9394
9495# Install packages and test
9596for VENV in " ${VENVS[@]} " ; do
96- ${VENV} /bin/pip install itk --user -- no-cache-dir --no-index -f ${SCRIPT_DIR} /../ /dist
97+ ${VENV} /bin/pip install itk --no-cache-dir --no-index -f ${SCRIPT_DIR} /../dist
9798 (cd $HOME ; ${VENV} /bin/python -c ' import itk;' )
9899 (cd $HOME ; ${VENV} /bin/python -c ' import itk; image = itk.Image[itk.UC, 2].New()' )
99100done
Original file line number Diff line number Diff line change @@ -153,7 +153,8 @@ function install_macpython {
153153 fi
154154 sudo installer -pkg $inst_path -target /
155155 local py_mm=${py_version: 0: 3}
156- PYTHON_EXE=$MACPYTHON_PY_PREFIX /$py_mm /bin/python$py_mm
156+ local py_m=${py_version: 0: 1}
157+ PYTHON_EXE=$MACPYTHON_PY_PREFIX /$py_mm /bin/python$py_m
157158}
158159
159160function install_pip {
@@ -178,7 +179,7 @@ function install_virtualenv {
178179 check_pip
179180 # Travis VMS install virtualenv for system python by default - force
180181 # install even if installed already
181- $PIP_CMD install virtualenv --ignore-installed
182+ $PYTHON_EXE -m pip install virtualenv --ignore-installed
182183 check_python
183184 VIRTUALENV_CMD=" $( dirname $PYTHON_EXE ) /virtualenv"
184185}
@@ -187,7 +188,12 @@ function install_virtualenv {
187188# Remove previous versions
188189sudo rm -rf ${MACPYTHON_FRAMEWORK}
189190
190- for pyversion in 2.7.13 3.4.6 3.5.3 3.6.0; do
191+ LATEST_27=2.7.13
192+ LATEST_34=3.4.4
193+ LATEST_35=3.5.3
194+ LATEST_36=3.6.0
195+
196+ for pyversion in $LATEST_27 $LATEST_34 $LATEST_35 $LATEST_36 ; do
191197 install_macpython $pyversion
192198 install_pip
193199 install_virtualenv
You can’t perform that action at this time.
0 commit comments