Skip to content

Commit b14c76e

Browse files
thewtexthewtex
committed
Merge branch 'master' into release
2 parents 1a11e48 + 81ad77b commit b14c76e

11 files changed

+110
-112
lines changed

‎CMakeLists.txt‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ if(ITKPythonPackage_SUPERBUILD)
7373
include(ExternalProject)
7474

7575
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
76-
# ITK master 2019-12-07
77-
set(ITK_GIT_TAG "7fd3e4082b13a580f6438e9efb041c3eb618fd1c")
76+
# ITK nightly-master 2020-02-19
77+
set(ITK_GIT_TAG "808cd8ba30")
7878

7979
#-----------------------------------------------------------------------------
8080
# A separate project is used to download ITK, so that it can reused
@@ -128,34 +128,36 @@ if(ITKPythonPackage_SUPERBUILD)
128128
message(STATUS "SuperBuild - Searching for python")
129129

130130
# Sanity checks
131-
if(DEFINED PYTHON_INCLUDE_DIR AND NOT EXISTS ${PYTHON_INCLUDE_DIR})
132-
message(FATAL_ERROR "PYTHON_INCLUDE_DIR variable is defined but corresponds to nonexistent directory")
131+
if(DEFINED Python3_INCLUDE_DIR AND NOT EXISTS ${Python3_INCLUDE_DIR})
132+
message(FATAL_ERROR "Python3_INCLUDE_DIR variable is defined but corresponds to nonexistent directory")
133133
endif()
134-
if(DEFINED PYTHON_LIBRARY AND NOT EXISTS ${PYTHON_LIBRARY})
135-
message(FATAL_ERROR "PYTHON_LIBRARY variable is defined but corresponds to nonexistent file")
134+
if(DEFINED Python3_LIBRARY AND NOT EXISTS ${Python3_LIBRARY})
135+
message(FATAL_ERROR "Python3_LIBRARY variable is defined but corresponds to nonexistent file")
136136
endif()
137-
if(DEFINED PYTHON_EXECUTABLE AND NOT EXISTS ${PYTHON_EXECUTABLE})
138-
message(FATAL_ERROR "PYTHON_EXECUTABLE variable is defined but corresponds to nonexistent file")
137+
if(DEFINED Python3_EXECUTABLE AND NOT EXISTS ${Python3_EXECUTABLE})
138+
message(FATAL_ERROR "Python3_EXECUTABLE variable is defined but corresponds to nonexistent file")
139139
endif()
140140
if(DEFINED DOXYGEN_EXECUTABLE AND NOT EXISTS ${DOXYGEN_EXECUTABLE})
141141
message(FATAL_ERROR "DOXYGEN_EXECUTABLE variable is defined but corresponds to nonexistent file")
142142
endif()
143143

144-
if(NOT DEFINED PYTHON_INCLUDE_DIR
145-
OR NOT DEFINED PYTHON_LIBRARY
146-
OR NOT DEFINED PYTHON_EXECUTABLE)
147-
148-
find_package ( PythonLibs REQUIRED )
149-
find_package ( PythonInterp REQUIRED )
144+
if(NOT DEFINED Python3_INCLUDE_DIR
145+
OR NOT DEFINED Python3_LIBRARY
146+
OR NOT DEFINED Python3_EXECUTABLE)
150147

148+
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
149+
if(NOT Python3_EXECUTABLE AND _Python3_EXECUTABLE)
150+
set(Python3_EXECUTABLE ${_Python3_EXECUTABLE} CACHE INTERNAL
151+
"Path to the Python interpreter" FORCE)
152+
endif()
151153
endif()
152154
if(NOT DEFINED DOXYGEN_EXECUTABLE)
153155
find_package(Doxygen REQUIRED)
154156
endif()
155157

156-
message(STATUS "SuperBuild - PYTHON_INCLUDE_DIR: ${PYTHON_INCLUDE_DIR}")
157-
message(STATUS "SuperBuild - PYTHON_LIBRARY: ${PYTHON_LIBRARY}")
158-
message(STATUS "SuperBuild - PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
158+
message(STATUS "SuperBuild - Python3_INCLUDE_DIR: ${Python3_INCLUDE_DIR}")
159+
message(STATUS "SuperBuild - Python3_LIBRARY: ${Python3_LIBRARY}")
160+
message(STATUS "SuperBuild - Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
159161
message(STATUS "SuperBuild - Searching for python[OK]")
160162
message(STATUS "SuperBuild - DOXYGEN_EXECUTABLE: ${DOXYGEN_EXECUTABLE}")
161163

@@ -220,14 +222,13 @@ if(ITKPythonPackage_SUPERBUILD)
220222
-DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=${install_component_per_module}
221223
-DITK_LEGACY_SILENT:BOOL=ON
222224
-DITK_WRAP_PYTHON:BOOL=ON
223-
-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF
224225
-DITK_WRAP_unsigned_short:BOOL=ON
225226
-DITK_WRAP_double:BOOL=ON
226227
-DITK_WRAP_DOC:BOOL=ON
227228
-DDOXYGEN_EXECUTABLE:FILEPATH=${DOXYGEN_EXECUTABLE}
228-
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR}
229-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
230-
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}
229+
-DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR}
230+
-DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY}
231+
-DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE}
231232
${ep_common_cmake_cache_args}
232233
${ep_itk_cmake_cache_args}
233234
USES_TERMINAL_DOWNLOAD 1

‎itkVersion.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '5.1rc1.post1'
1+
VERSION = '5.1rc01.dev20200219+209.g808cd8ba30'
22

33
def get_versions():
44
"""Returns versions for the ITK Python package.

‎scripts/internal/manylinux-build-common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ echo "Building wheels for $ARCH"
4949
# not the extension itself is explicitly linked against libpython. [...]"
5050
#
5151
# Source: https://www.python.org/dev/peps/pep-0513/#libpythonx-y-so-1
52-
PYTHON_LIBRARY=$(cd $(dirname $0); pwd)/libpython-not-needed-symbols-exported-by-interpreter
53-
touch ${PYTHON_LIBRARY}
52+
Python3_LIBRARY=$(cd $(dirname $0); pwd)/libpython-not-needed-symbols-exported-by-interpreter
53+
touch ${Python3_LIBRARY}
5454

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
#
66
ARCH=""
77
PYBINARIES=""
8-
PYTHON_LIBRARY=""
8+
Python3_LIBRARY=""
99

1010
script_dir=$(cd $(dirname $0) || exit 1; pwd)
1111
source "${script_dir}/manylinux-build-common.sh"
1212
# -----------------------------------------------------------------------
1313

1414
# Compile wheels re-using standalone project and archive cache
1515
for PYBIN in "${PYBINARIES[@]}"; do
16-
PYTHON_EXECUTABLE=${PYBIN}/python
17-
PYTHON_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
16+
Python3_EXECUTABLE=${PYBIN}/python
17+
Python3_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
1818

1919
echo ""
20-
echo "PYTHON_EXECUTABLE:${PYTHON_EXECUTABLE}"
21-
echo "PYTHON_INCLUDE_DIR:${PYTHON_INCLUDE_DIR}"
22-
echo "PYTHON_LIBRARY:${PYTHON_LIBRARY}"
20+
echo "Python3_EXECUTABLE:${Python3_EXECUTABLE}"
21+
echo "Python3_INCLUDE_DIR:${Python3_INCLUDE_DIR}"
22+
echo "Python3_LIBRARY:${Python3_LIBRARY}"
2323

2424
if [[ -e /work/requirements-dev.txt ]]; then
2525
${PYBIN}/pip install --upgrade -r /work/requirements-dev.txt
@@ -46,9 +46,9 @@ for PYBIN in "${PYBINARIES[@]}"; do
4646
-DSWIG_EXECUTABLE:FILEPATH=${itk_build_dir}/Wrapping/Generators/SwigInterface/swig/bin/swig \
4747
-DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
4848
-DBUILD_TESTING:BOOL=OFF \
49-
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
50-
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
51-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
49+
-DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
50+
-DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
51+
-DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY} \
5252
|| exit 1
5353
${PYBIN}/python setup.py clean
5454
done

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
ARCH=""
77
PYBINARIES=""
8-
PYTHON_LIBRARY=""
8+
Python3_LIBRARY=""
99

1010
script_dir=$(cd $(dirname $0) || exit 1; pwd)
1111
source "${script_dir}/manylinux-build-common.sh"
@@ -28,13 +28,13 @@ SINGLE_WHEEL=0
2828

2929
# Compile wheels re-using standalone project and archive cache
3030
for PYBIN in "${PYBINARIES[@]}"; do
31-
export PYTHON_EXECUTABLE=${PYBIN}/python
32-
PYTHON_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
31+
export Python3_EXECUTABLE=${PYBIN}/python3
32+
Python3_INCLUDE_DIR=$( find -L ${PYBIN}/../include/ -name Python.h -exec dirname {} \; )
3333

3434
echo ""
35-
echo "PYTHON_EXECUTABLE:${PYTHON_EXECUTABLE}"
36-
echo "PYTHON_INCLUDE_DIR:${PYTHON_INCLUDE_DIR}"
37-
echo "PYTHON_LIBRARY:${PYTHON_LIBRARY}"
35+
echo "Python3_EXECUTABLE:${Python3_EXECUTABLE}"
36+
echo "Python3_INCLUDE_DIR:${Python3_INCLUDE_DIR}"
37+
echo "Python3_LIBRARY:${Python3_LIBRARY}"
3838

3939
# Install dependencies
4040
${PYBIN}/pip install --upgrade -r /work/requirements-dev.txt
@@ -43,7 +43,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
4343
source_path=/work/standalone-${ARCH}-build/ITKs
4444
build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux1_${ARCH}
4545
SETUP_PY_CONFIGURE="${script_dir}/../setup_py_configure.py"
46-
SKBUILD_CMAKE_INSTALL_PREFIX=$(${PYTHON_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
46+
SKBUILD_CMAKE_INSTALL_PREFIX=$(${Python3_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
4747

4848
# Clean up previous invocations
4949
rm -rf ${build_path}
@@ -65,9 +65,9 @@ for PYBIN in "${PYBINARIES[@]}"; do
6565
-DITK_WRAP_unsigned_short:BOOL=ON \
6666
-DITK_WRAP_double:BOOL=ON \
6767
-DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
68-
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
69-
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
70-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
68+
-DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
69+
-DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
70+
-DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY} \
7171
-DITK_WRAP_DOC:BOOL=ON \
7272
-DDOXYGEN_EXECUTABLE:FILEPATH=/work/tools/doxygen-1.8.11/bin/doxygen
7373
# Cleanup
@@ -88,9 +88,9 @@ for PYBIN in "${PYBINARIES[@]}"; do
8888
-DITK_SOURCE_DIR:PATH=${source_path} \
8989
-DITK_BINARY_DIR:PATH=${build_path} \
9090
-DBUILD_TESTING:BOOL=OFF \
91-
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
92-
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
93-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
91+
-DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
92+
-DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
93+
-DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY} \
9494
-DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
9595
-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
9696
-DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=ON \
@@ -99,7 +99,6 @@ for PYBIN in "${PYBINARIES[@]}"; do
9999
-DPY_SITE_PACKAGES_PATH:PATH="." \
100100
-DITK_LEGACY_SILENT:BOOL=ON \
101101
-DITK_WRAP_PYTHON:BOOL=ON \
102-
-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \
103102
-DITK_WRAP_DOC:BOOL=ON \
104103
-DDOXYGEN_EXECUTABLE:FILEPATH=/work/tools/doxygen-1.8.11/bin/doxygen \
105104
-G Ninja \
@@ -120,9 +119,9 @@ for PYBIN in "${PYBINARIES[@]}"; do
120119
-DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
121120
-DITK_WRAP_unsigned_short:BOOL=ON \
122121
-DITK_WRAP_double:BOOL=ON \
123-
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
124-
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
125-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
122+
-DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
123+
-DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
124+
-DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY} \
126125
-DITK_WRAP_DOC:BOOL=ON \
127126
-DDOXYGEN_EXECUTABLE:FILEPATH=/work/tools/doxygen-1.8.11/bin/doxygen \
128127
|| exit 1

‎scripts/internal/windows_build_common.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def venv_paths(python_version):
2525
python_library = "C:/Python%s/libs/python%s.lib" % (python_version, xy_ver)
2626

2727
print("")
28-
print("PYTHON_EXECUTABLE: %s" % python_executable)
29-
print("PYTHON_INCLUDE_DIR: %s" % python_include_dir)
30-
print("PYTHON_LIBRARY: %s" % python_library)
28+
print("Python3_EXECUTABLE: %s" % python_executable)
29+
print("Python3_INCLUDE_DIR: %s" % python_include_dir)
30+
print("Python3_LIBRARY: %s" % python_library)
3131

3232
pip = os.path.join(venv_dir, "Scripts", "pip.exe")
3333

‎scripts/macpython-build-common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ done
4343
# not the extension itself is explicitly linked against libpython. [...]"
4444
#
4545
# Source: https://www.python.org/dev/peps/pep-0513/#libpythonx-y-so-1
46-
PYTHON_LIBRARY=$(cd $(dirname $0); pwd)/internal/libpython-not-needed-symbols-exported-by-interpreter
47-
touch ${PYTHON_LIBRARY}
46+
Python3_LIBRARY=$(cd $(dirname $0); pwd)/internal/libpython-not-needed-symbols-exported-by-interpreter
47+
touch ${Python3_LIBRARY}

‎scripts/macpython-build-module-wheels.sh‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
MACPYTHON_PY_PREFIX=""
1515
# PYBINARIES="" # unused
16-
PYTHON_LIBRARY=""
16+
Python3_LIBRARY=""
1717
SCRIPT_DIR=""
1818
VENVS=()
1919

@@ -22,31 +22,31 @@ source "${script_dir}/macpython-build-common.sh"
2222
# -----------------------------------------------------------------------
2323

2424
VENV="${VENVS[0]}"
25-
PYTHON_EXECUTABLE=${VENV}/bin/python
26-
${PYTHON_EXECUTABLE} -m pip install --no-cache cmake
25+
Python3_EXECUTABLE=${VENV}/bin/python
26+
${Python3_EXECUTABLE} -m pip install --no-cache cmake
2727
# CMAKE_EXECUTABLE=${VENV}/bin/cmake
28-
${PYTHON_EXECUTABLE} -m pip install --no-cache ninja
28+
${Python3_EXECUTABLE} -m pip install --no-cache ninja
2929
NINJA_EXECUTABLE=${VENV}/bin/ninja
30-
${PYTHON_EXECUTABLE} -m pip install --no-cache delocate
30+
${Python3_EXECUTABLE} -m pip install --no-cache delocate
3131
DELOCATE_LISTDEPS=${VENV}/bin/delocate-listdeps
3232
DELOCATE_WHEEL=${VENV}/bin/delocate-wheel
3333

3434
# Compile wheels re-using standalone project and archive cache
3535
for VENV in "${VENVS[@]}"; do
3636
py_mm=$(basename ${VENV})
37-
PYTHON_EXECUTABLE=${VENV}/bin/python
38-
PYTHON_INCLUDE_DIR=$( find -L ${MACPYTHON_PY_PREFIX}/${py_mm}/include -name Python.h -exec dirname {} \; )
37+
Python3_EXECUTABLE=${VENV}/bin/python
38+
Python3_INCLUDE_DIR=$( find -L ${MACPYTHON_PY_PREFIX}/${py_mm}/include -name Python.h -exec dirname {} \; )
3939

4040
echo ""
41-
echo "PYTHON_EXECUTABLE:${PYTHON_EXECUTABLE}"
42-
echo "PYTHON_INCLUDE_DIR:${PYTHON_INCLUDE_DIR}"
43-
echo "PYTHON_LIBRARY:${PYTHON_LIBRARY}"
41+
echo "Python3_EXECUTABLE:${Python3_EXECUTABLE}"
42+
echo "Python3_INCLUDE_DIR:${Python3_INCLUDE_DIR}"
43+
echo "Python3_LIBRARY:${Python3_LIBRARY}"
4444

4545
if [[ -e $PWD/requirements-dev.txt ]]; then
46-
${PYTHON_EXECUTABLE} -m pip install --upgrade -r $PWD/requirements-dev.txt
46+
${Python3_EXECUTABLE} -m pip install --upgrade -r $PWD/requirements-dev.txt
4747
fi
4848
itk_build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
49-
${PYTHON_EXECUTABLE} setup.py bdist_wheel --build-type Release --plat-name macosx-10.9-x86_64 -G Ninja -- \
49+
${Python3_EXECUTABLE} setup.py bdist_wheel --build-type Release --plat-name macosx-10.9-x86_64 -G Ninja -- \
5050
-DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
5151
-DITK_DIR:PATH=${itk_build_path} \
5252
-DITK_USE_SYSTEM_SWIG:BOOL=ON \
@@ -55,11 +55,11 @@ for VENV in "${VENVS[@]}"; do
5555
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9 \
5656
-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 \
5757
-DBUILD_TESTING:BOOL=OFF \
58-
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
59-
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
60-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
58+
-DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
59+
-DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
60+
-DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY} \
6161
|| exit 1
62-
${PYTHON_EXECUTABLE} setup.py clean
62+
${Python3_EXECUTABLE} setup.py clean
6363
done
6464

6565
${DELOCATE_LISTDEPS} $PWD/dist/*.whl # lists library dependencies

0 commit comments

Comments
 (0)