Skip to content

Commit b09c961

Browse files
SirokujiraSirokujira
committed
・update ci settings
・update setup.py
1 parent 921fb3d commit b09c961

File tree

5 files changed

+217
-137
lines changed

5 files changed

+217
-137
lines changed

‎.travis.yml

Lines changed: 190 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,257 @@
1-
dist: xenial
2-
sudo: required
1+
# 'sudo' is enabled automatically by the 'apt' addon below.
2+
#sudo: false
3+
#sudo: required
34

45

5-
language: python
6-
7-
cache:
8-
- pip
9-
- ccache
10-
11-
# https://docs.travis-ci.com/user/languages/cpp/
6+
# https://docs.travis-ci.com/user/languages/python/#running-python-tests-on-multiple-operating-systems
127
matrix:
138
include:
149
# gcc
1510
- os: linux
11+
dist: trusty
12+
language: python
1613
python: "2.7"
1714
addons:
1815
apt:
1916
sources:
2017
- ubuntu-toolchain-r-test
2118
packages:
19+
- openni2-utils
20+
- build-essential
21+
- gcc-4.9
2222
- g++-4.9
2323
env:
2424
- PCL_VERSION="1.7"
25+
- OS_VERSION="trusty"
2526
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
2627
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
2728
- os: linux
29+
dist: trusty
30+
language: python
2831
python: "3.5"
2932
addons:
3033
apt:
3134
sources:
3235
- ubuntu-toolchain-r-test
3336
packages:
3437
- openni2-utils
38+
- build-essential
39+
- gcc-4.9
3540
- g++-4.9
3641
env:
3742
- PCL_VERSION="1.7"
43+
- OS_VERSION="trusty"
3844
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
3945
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
4046
- os: linux
47+
dist: trusty
48+
language: python
4149
python: "3.6"
4250
addons:
4351
apt:
4452
sources:
4553
- ubuntu-toolchain-r-test
4654
packages:
4755
- openni2-utils
56+
- build-essential
57+
- gcc-4.9
4858
- g++-4.9
4959
env:
5060
- PCL_VERSION="1.7"
61+
- OS_VERSION="trusty"
5162
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
5263
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
5364
- os: linux
65+
dist: xenial # required for Python >= 3.7
66+
language: python
5467
python: "3.7"
5568
addons:
5669
apt:
5770
sources:
5871
- ubuntu-toolchain-r-test
5972
packages:
6073
- openni2-utils
74+
- build-essential
75+
- gcc-4.9
6176
- g++-4.9
6277
env:
6378
- PCL_VERSION="1.7"
79+
- OS_VERSION="xenial"
6480
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
6581
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
66-
# TravisCI TimeLimit 50min
67-
# gcc
68-
- os: osx
69-
language: generic
70-
compiler: gcc
82+
- os: linux
83+
dist: xenial # required for Python >= 3.7
84+
language: python
85+
python: "3.7"
86+
addons:
87+
apt:
88+
sources:
89+
- ubuntu-toolchain-r-test
90+
packages:
91+
- openni2-utils
92+
- g++-4.9
7193
env:
72-
- PYTHON_VERSION=2.7.10
73-
- PYENV_ROOT=~/.pyenv
74-
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
75-
- NOSEATTR="not pcl_ver_0_4"
76-
- os: osx
77-
language: generic
78-
compiler: gcc
94+
- PCL_VERSION="1.8"
95+
- OS_VERSION="xenial"
96+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
97+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
98+
- os: linux
99+
dist: xenial # required for Python >= 3.7
100+
language: python
101+
python: "3.7"
102+
addons:
103+
apt:
104+
sources:
105+
- ubuntu-toolchain-r-test
106+
packages:
107+
- openni2-utils
108+
- g++-4.9
79109
env:
80-
- PYTHON_VERSION=3.5.1
81-
- PYENV_ROOT=~/.pyenv
82-
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
83-
- NOSEATTR="not pcl_ver_0_4"
84-
- os: osx
85-
language: generic
86-
compiler: gcc
110+
- PCL_VERSION="1.9"
111+
- OS_VERSION="xenial"
112+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
113+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
114+
# clang
115+
- os: linux
116+
dist: trusty
117+
language: python
118+
python: "2.7"
119+
addons:
120+
apt:
121+
sources:
122+
- ubuntu-toolchain-r-test
123+
packages:
124+
- clang++-3.9
87125
env:
88-
- PYTHON_VERSION=3.6.0
89-
- PYENV_ROOT=~/.pyenv
90-
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
91-
- NOSEATTR="not pcl_ver_0_4"
92-
- os: osx
93-
language: generic
94-
compiler: gcc
126+
- PCL_VERSION="1.7"
127+
- OS_VERSION="trusty"
128+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
129+
- MATRIX_EVAL="CC=clang-3.9 && CXX=g++-4.9"
130+
- os: linux
131+
dist: trusty
132+
language: python
133+
python: "3.5"
134+
addons:
135+
apt:
136+
sources:
137+
- ubuntu-toolchain-r-test
138+
packages:
139+
- openni2-utils
140+
- g++-4.9
95141
env:
96-
- PYTHON_VERSION=3.7.0
97-
- PYENV_ROOT=~/.pyenv
98-
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
99-
- NOSEATTR="not pcl_ver_0_4"
100-
# clang
142+
- PCL_VERSION="1.7"
143+
- OS_VERSION="trusty"
144+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
145+
- MATRIX_EVAL="CC=clang-3.9 && CXX=g++-4.9"
146+
- os: linux
147+
dist: trusty
148+
language: python
149+
python: "3.6"
150+
addons:
151+
apt:
152+
sources:
153+
- ubuntu-toolchain-r-test
154+
packages:
155+
- openni2-utils
156+
- clang++-3.9
157+
env:
158+
- PCL_VERSION="1.7"
159+
- OS_VERSION="trusty"
160+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
161+
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
162+
- os: linux
163+
dist: xenial # required for Python >= 3.7
164+
language: python
165+
python: "3.7"
166+
addons:
167+
apt:
168+
sources:
169+
- ubuntu-toolchain-r-test
170+
packages:
171+
- openni2-utils
172+
- clang++-3.9
173+
env:
174+
- PCL_VERSION="1.7"
175+
- OS_VERSION="xenial"
176+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
177+
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
178+
- os: linux
179+
dist: xenial # required for Python >= 3.7
180+
language: python
181+
python: "3.7"
182+
addons:
183+
apt:
184+
sources:
185+
- ubuntu-toolchain-r-test
186+
packages:
187+
- openni2-utils
188+
- clang++-3.9
189+
env:
190+
- PCL_VERSION="1.8"
191+
- OS_VERSION="xenial"
192+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
193+
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
194+
- os: linux
195+
dist: xenial # required for Python >= 3.7
196+
language: python
197+
python: "3.7"
198+
addons:
199+
apt:
200+
sources:
201+
- ubuntu-toolchain-r-test
202+
packages:
203+
- openni2-utils
204+
- clang++-3.9
205+
env:
206+
- PCL_VERSION="1.9"
207+
- OS_VERSION="xenial"
208+
- NOSEATTR="not pcl_ver_0_4 and not pcl_over_18"
209+
- MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
210+
# TravisCI TimeLimit 50min
211+
# clang only(gcc replace clang)
101212
# homebrew pcl use gcc compiler
102213
- os: osx
103214
language: generic
104-
compiler: clang
105215
env:
106-
- PYTHON_VERSION=2.7.10
216+
- PYTHON_VERSION=2.7.16
107217
- PYENV_ROOT=~/.pyenv
108218
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
109219
- NOSEATTR="not pcl_ver_0_4"
110220
- os: osx
111221
language: generic
112-
compiler: clang
113222
env:
114-
- PYTHON_VERSION=3.5.1
223+
- PYTHON_VERSION=3.5.7
115224
- PYENV_ROOT=~/.pyenv
116225
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
117226
- NOSEATTR="not pcl_ver_0_4"
118227
- os: osx
119228
language: generic
120-
compiler: clang
121229
env:
122-
- PYTHON_VERSION=3.6.0
230+
- PYTHON_VERSION=3.6.8
123231
- PYENV_ROOT=~/.pyenv
124232
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
125233
- NOSEATTR="not pcl_ver_0_4"
126234
- os: osx
127235
language: generic
128-
compiler: clang
129236
env:
130-
- PYTHON_VERSION=3.7.0
237+
- PYTHON_VERSION=3.7.3
131238
- PYENV_ROOT=~/.pyenv
132239
- PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
133240
- NOSEATTR="not pcl_ver_0_4"
134241

135242

136-
# pcl 1.8.1 only(MacOSX/Ubuntu)
137-
# pcl_2d-1.8.pc copy /usr/local/lib/pkgconfig/pcl_2d-1.8.pc
138-
# Check command
139-
# pkg-config pcl_2d-1.8 --libs
140-
before_install:
141-
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then
142-
brew update >/dev/null;
143-
brew outdated pyenv || brew upgrade --quiet pyenv;
144-
brew install homebrew/boneyard/pyenv-pip-rehash;
145-
brew tap homebrew/science;
146-
147-
PYTHON_CONFIGURE_OPTS="--enable-unicode=ucs2" pyenv install -ks $PYTHON_VERSION;
148-
pyenv global $PYTHON_VERSION;
149-
python --version;
243+
cache:
244+
- pip
245+
- ccache
246+
directories:
247+
- $HOME/Library/Caches/Homebrew
150248

151-
travis_wait 45 brew install pcl --without-qt;
152249

153-
ls /usr/local/include;
250+
before_cache:
251+
- brew cleanup
154252

155-
cp -n ./travisCI/pcl_2d-1.8.pc /usr/local/lib/pkgconfig/pcl_2d-1.8.pc;
156-
fi
157253

254+
# (Mac OSX using pcl 1.9.1 only [homebrew])
158255
# eval "${MATRIX_EVAL}";
159256
# trusty(pcl-1.7.0?)
160257
# sudo add-apt-repository ppa:v-launchpad-jochen-sprickerhof-de/pcl -y;
@@ -163,11 +260,25 @@ before_install:
163260
# use Ubuntu official package(Ubuntu 16.04 use pcl 1.7.2)
164261
# sudo apt-get install libpcl-dev -y;
165262
# sudo apt install git build-essential linux-libc-dev cmake cmake-gui libusb-1.0-0-dev libusb-dev libudev-dev mpi-default-dev openmpi-bin openmpi-common libflann1.8 libflann-dev libeigen3-dev libboost-all-dev libqhull* libgtest-dev freeglut3-dev pkg-config libxmu-dev libxi-dev mono-complete qt-sdk openjdk-8-jdk openjdk-8-jre libproj-dev libglfw3-dev;
166-
install:
167-
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.7" ) ]]; then
263+
before_install:
264+
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then
265+
brew update >/dev/null;
266+
brew install ccache;
168267

169-
sudo apt-get install libpcl-dev -y;
170-
sudo apt install git build-essential linux-libc-dev cmake cmake-gui libusb-1.0-0-dev libusb-dev libudev-dev mpi-default-dev openmpi-bin openmpi-common libflann1.8 libflann-dev libeigen3-dev libboost-all-dev libqhull* libgtest-dev freeglut3-dev pkg-config libxmu-dev libxi-dev mono-complete qt-sdk openjdk-8-jdk openjdk-8-jre libproj-dev libglfw3-dev;
268+
PYTHON_CONFIGURE_OPTS="--enable-unicode=ucs2" pyenv install -ks $PYTHON_VERSION;
269+
pyenv global $PYTHON_VERSION;
270+
python --version;
271+
272+
travis_wait 45 brew install pcl --without-qt;
273+
fi
274+
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.7" ) && ( "$OS_VERSION" == "trusty") ]]; then
275+
sudo add-apt-repository ppa:v-launchpad-jochen-sprickerhof-de/pcl -y;
276+
sudo apt -y update;
277+
sudo apt -y install libpcl-all;
278+
fi
279+
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.7" ) && ( "$OS_VERSION" == "xenial") ]]; then
280+
sudo apt -y install git build-essential linux-libc-dev cmake cmake-gui libusb-1.0-0-dev libusb-dev libudev-dev mpi-default-dev openmpi-bin openmpi-common libflann1.8 libflann-dev libeigen3-dev libboost-all-dev libqhull* libgtest-dev freeglut3-dev pkg-config libxmu-dev libxi-dev mono-complete qt-sdk openjdk-8-jdk openjdk-8-jre libproj-dev libglfw3-dev;
281+
sudo apt -y install libpcl-dev;
171282
fi
172283
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$PCL_VERSION" == "1.8" ) ]]; then
173284
sudo add-apt-repository -y ppa:webupd8team/java && sudo apt update && sudo apt -y install oracle-java8-installer;
@@ -225,21 +336,26 @@ install:
225336
sudo ninja -t targets install;
226337
cd ../..;
227338
fi
339+
340+
install:
228341
- pip install --upgrade pip
229-
- pip install cython>=0.25.2
342+
- pip install -r requirements.txt
230343
- pip install nose
231-
- pip install numpy
344+
# coveralls
345+
- pip install pytest
232346
- pip install coveralls
347+
233348
- python setup.py build_ext -i
234349
- python setup.py install
235350

351+
# command to run tests
236352
script:
237353
# - coverage run --parallel-mode tests/test_pcl.py
238354
# - coverage run --parallel-mode tests/test_registration.py
239355
# - nosetests -A "$NOSEATTR" --with-coverage --cover-erase --cover-package=python-pcl --verbose
240356
# - nosetests -A "not pcl_ver_0_4 and not pcl_over_18" --with-coverage --cover-erase --cover-package=python-pcl --verbose
241357
- nosetests -A "not pcl_ver_0_4 and not pcl_over_18" --verbose
242-
358+
# - py.test --cov pcl
243359
# examples
244360
# - python examples/GrabberCallbackTest.py
245361
# examples/official
@@ -266,6 +382,7 @@ script:
266382
# - python examples/official/surface/resampling.py
267383

268384
after_success:
385+
# coveralls.io
269386
- coverage combine
270387
- coveralls
271388

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy