Skip to content

[WIP] Travis: build pyTuttle with numpy #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[WIP] Travis: build pyTuttle with numpy #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6417246
Travis: build tuttle binding with numpy
Jun 7, 2016
2ac86bf
pyTest: activate python tests with numpy
Jun 7, 2016
675d6bc
CMake: added a warn message if cannot find numpy headers
Jun 7, 2016
6cfbac7
Travis: fixed import of numpy
Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ addons:
- libboost1.55-all-dev
- python-dev
- python-imaging
- python-numpy
- python-nose
- python3-dev
- python3-setuptools
Expand Down
1 change: 1 addition & 0 deletions libraries/tuttle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ if (TuttleBoost_FOUND)
if(NUMPY_FOUND)
include_directories(${NUMPY_INCLUDE_DIR})
else()
message(WARNING "Cannot find numpy headers: TuttleOFX python binding will not use numpy.")
set(SWIG_NUMPY_FLAG "-DWITHOUT_NUMPY")
endif()
endif()
Expand Down
Empty file added libraries/tuttle/pyTest/numpy/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion tools/travis/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi

# Build tuttle
cmake --version
cmake ${TUTTLEOFX_DEV} -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${TUTTLEOFX_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DTUTTLE_EXPERIMENTAL=True -DWITHOUT_NUMPY=True -DTUTTLE_DEPLOY_DEPENDENCIES=True -DTUTTLE_PYTHON_VERSION=${PYTHON_VERSION}
cmake ${TUTTLEOFX_DEV} -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=${TUTTLEOFX_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DTUTTLE_EXPERIMENTAL=True -DTUTTLE_DEPLOY_DEPENDENCIES=True -DTUTTLE_PYTHON_VERSION=${PYTHON_VERSION}
make -k
make install/strip
cd ..
4 changes: 3 additions & 1 deletion tools/travis/install_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
# Install python packages to run sam command line
if [[ ${PYTHON_VERSION} == "2.7" ]]; then
pip install --user clint argcomplete
# elif [[ ${PYTHON_VERSION} == "3.2" ]]; then
pip install --user numpy
elif [[ ${PYTHON_VERSION} == "3.2" ]]; then
# easy_install3 pip --prefix=$HOME/local
# pip3 install --user clint argcomplete
pip3 install --user numpy
fi

# Use TRAVIS_JOB_ID to detect that we are in travis.
Expand Down