File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -73,8 +73,8 @@ if(VTKPythonPackage_SUPERBUILD)
7373 include (ExternalProject )
7474
7575 set (VTK_REPOSITORY "https://github.com/kitware/VTK.git" )
76- # VTK nightly-master 2017-12-13
77- set (VTK_GIT_TAG "ab71574 " )
76+ # VTK nightly-master 2018-05-14
77+ set (VTK_GIT_TAG "v8.1.1 " )
7878
7979 #-----------------------------------------------------------------------------
8080 # A separate project is used to download VTK, so that it can reused
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+
3+ # This script creates a tarball of the VTK Python package build tree. It is
4+ # downloaded by the external module build scripts and used to build their
5+ # Python package on GitHub CI services.
6+
7+ SCRIPT_DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
8+ cd $SCRIPT_DIR /../..
9+
10+ tar -c --to-stdout \
11+ VTKPythonPackage/VTK-* \
12+ VTKPythonPackage/standalone-* \
13+ VTKPythonPackage/scripts > VTKPythonBuilds-linux.tar
14+ ZSTD=zstd
15+ if test -e /home/kitware/Support/zstd-build/programs/zstd; then
16+ ZSTD=/home/kitware/Support/zstd-build/programs/zstd
17+ fi
18+ $ZSTD -f \
19+ ./VTKPythonBuilds-linux.tar \
20+ -o ./VTKPythonBuilds-linux.tar.zst
Original file line number Diff line number Diff line change @@ -7,7 +7,13 @@ set -e -x
77# For example,
88# manylinux-build-wheels.sh cp27mu cp35
99if [[ $# -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
1117else
1218 PYBINARIES=()
1319 for version in " $@ " ; do
Original file line number Diff line number Diff line change @@ -23,12 +23,7 @@ popd > /dev/null 2>&1
2323
2424# Compile wheels re-using standalone project and archive cache
2525for PYBIN in " ${PYBINARIES[@]} " ; do
26- if [[ ${PYBIN} == * " cp26" * || ${PYBIN} == * " cp33" * ]]; then
27- echo " Skipping ${PYBIN} "
28- continue
29- fi
30-
31- PYTHON_EXECUTABLE=${PYBIN} /python
26+ export PYTHON_EXECUTABLE=${PYBIN} /python
3227 PYTHON_INCLUDE_DIR=$( find -L ${PYBIN} /../include/ -name Python.h -exec dirname {} \; )
3328
3429 echo " "
@@ -61,6 +56,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
6156 # Cleanup
6257 ${PYBIN} /python setup.py clean
6358
59+ # Remove unnecessary files for building against VTK
60+ find ${build_path} -name ' *.o' -delete
6461done
6562
6663# Fixup the wheels (update from 'linux' to 'manylinux1' tag)
7269
7370# Install packages and test
7471for PYBIN in " ${PYBINARIES[@]} " ; do
75- if [[ ${PYBIN} == * " cp26" * || ${PYBIN} == * " cp33" * ]]; then
76- echo " Skipping ${PYBIN} "
77- continue
78- fi
7972 # ${PYBIN}/pip install numpy
8073 ${PYBIN} /pip install vtk --no-cache-dir --no-index -f /work/dist
8174 # (cd $HOME && ${PYBIN}/python -c 'from itk import ITKCommon;')
Original file line number Diff line number Diff line change 1- VERSION = '8.1.0 '
1+ VERSION = '8.1.1 '
22
33def get_versions ():
44 """Returns versions for the VTK Python package.
You can’t perform that action at this time.
0 commit comments