Skip to content

Commit 922e5c2

Browse files
committed
travis: fix numpy for Python3
1 parent 3c50165 commit 922e5c2

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ env:
1313
- DO_COVERAGE_ON_BRANCH="master;release"
1414
- DO_CPPCHECK_ON_BRANCH=""
1515
- DO_INSTALL_DOC_EXCEPT_ON_BRANCH=""
16-
- BUILD_WITH_CATKIN_SUPPORT=false
1716
- MAKEFLAGS="-j2"
1817

1918
jobs:
@@ -67,7 +66,7 @@ branches:
6766
- master
6867
- debian
6968
- devel
70-
before_install: ./.travis/run before_install
69+
before_install: ./travis_custom/custom_before_install
7170
install: pip install coveralls numpy --user
7271
script:
7372
- export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
# Add Python dependency
4+
echo "TRAVIS_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION"
5+
if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
6+
export APT_DEPENDENCIES=$APT_DEPENDENCIES" python3-numpy"
7+
fi
8+
9+
# When this script is called the current directory is ./custom_travis
10+
. ./.travis/run ../.travis/before_install
11+
12+
# Git fetch tags
13+
git fetch --tags
14+

travis_custom/custom_build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ fi
1111

1212
if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
1313
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python3)"
14-
pip3 install numpy --user
1514
fi
1615

1716
# Setup environment variables.

0 commit comments

Comments
 (0)