Skip to content

Commit e01c674

Browse files
committed
Travis: LOGGING
Also cleanup leftover Python2 code
1 parent e933f13 commit e01c674

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

.travis.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,16 @@ jobs:
4343
- <<: *style_python
4444
name: [email protected] +PEP8
4545
python: "3.6"
46+
- <<: *style_python
47+
name: [email protected] +PEP8
48+
python: "3.7"
49+
dist: xenial
50+
sudo: true
4651
# - &style_cpp
4752
# stage: 'Style'
4853
4954
# language: python
50-
# python: "2.7"
55+
# python: "3.6"
5156
# addons:
5257
# apt:
5358
# sources:
@@ -111,6 +116,7 @@ jobs:
111116
# -DopenPMD_USE_ADIOS1=$USE_ADIOS1
112117
# -DopenPMD_USE_ADIOS2=$USE_ADIOS2
113118
# -DopenPMD_USE_PYTHON=OFF
119+
# -DopenPMD_USE_LOGGING=ON
114120
# -DopenPMD_USE_INVASIVE_TESTS=ON
115121
# $TRAVIS_BUILD_DIR
116122
# script:
@@ -150,6 +156,7 @@ jobs:
150156
-DopenPMD_USE_ADIOS1=$USE_ADIOS1
151157
-DopenPMD_USE_ADIOS2=$USE_ADIOS2
152158
-DopenPMD_USE_PYTHON=$USE_PYTHON
159+
-DopenPMD_USE_LOGGING=ON
153160
-DopenPMD_USE_INVASIVE_TESTS=ON
154161
$TRAVIS_BUILD_DIR
155162
script:
@@ -198,7 +205,7 @@ jobs:
198205
fi
199206
fi
200207
- if [ "$USE_PYTHON" == "ON" ]; then
201-
export EXTRA_CMAKE_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=$(which python)";
208+
export EXTRA_CMAKE_FLAGS="-DPYTHON_EXECUTABLE:FILEPATH=$(which python3)";
202209
if [ "$USE_INTERNAL_PYBIND11" == "OFF" ]; then
203210
export EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DopenPMD_USE_INTERNAL_PYBIND11=OFF";
204211
fi;
@@ -212,6 +219,7 @@ jobs:
212219
-DopenPMD_USE_ADIOS1=$USE_ADIOS1
213220
-DopenPMD_USE_ADIOS2=$USE_ADIOS2
214221
-DopenPMD_USE_PYTHON=$USE_PYTHON
222+
-DopenPMD_USE_LOGGING=OFF
215223
-DopenPMD_USE_INVASIVE_TESTS=ON
216224
$EXTRA_CMAKE_FLAGS
217225
-DCMAKE_INSTALL_PREFIX=$HOME/openPMD-test-install
@@ -315,7 +323,7 @@ jobs:
315323
- <<: *test-cpp-unit
316324
name: [email protected] -MPI -PY +H5 +ADIOS1
317325
language: python
318-
python: "2.7"
326+
python: "3.6"
319327
env:
320328
- CXXSPEC="%[email protected]" USE_MPI=OFF USE_PYTHON=OFF USE_HDF5=ON USE_ADIOS1=ON USE_ADIOS2=OFF USE_SAMPLES=OFF
321329
compiler: gcc
@@ -333,7 +341,7 @@ jobs:
333341
- <<: *test-cpp-unit
334342
name: [email protected] +MPI -PY +H5 +ADIOS1
335343
language: python
336-
python: "2.7"
344+
python: "3.6"
337345
env:
338346
- CXXSPEC="%[email protected]" USE_MPI=ON USE_PYTHON=OFF USE_HDF5=ON USE_ADIOS1=ON USE_ADIOS2=OFF USE_SAMPLES=ON
339347
compiler: gcc
@@ -350,7 +358,7 @@ jobs:
350358
- <<: *test-cpp-unit
351359
name: [email protected] -MPI -PY +H5 +ADIOS1 -JSON
352360
language: python
353-
python: "2.7"
361+
python: "3.6"
354362
env:
355363
- CXXSPEC="%[email protected]" USE_MPI=OFF USE_PYTHON=OFF USE_JSON=OFF USE_HDF5=ON USE_ADIOS1=ON USE_ADIOS2=OFF USE_SAMPLES=ON
356364
compiler: gcc
@@ -368,7 +376,7 @@ jobs:
368376
- <<: *test-cpp-unit
369377
name: [email protected] +MPI -PY +H5 +ADIOS1
370378
language: python
371-
python: "2.7"
379+
python: "3.6"
372380
env:
373381
- CXXSPEC="%[email protected]" USE_MPI=ON USE_PYTHON=OFF USE_HDF5=ON USE_ADIOS1=ON USE_ADIOS2=OFF USE_SAMPLES=ON
374382
compiler: gcc
@@ -464,7 +472,7 @@ jobs:
464472
name: [email protected] +coveralls
465473
sudo: required
466474
language: python
467-
python: "2.7"
475+
python: "3.6"
468476
compiler: gcc
469477
env:
470478
- CXXSPEC="%[email protected]" USE_MPI=ON USE_PYTHON=ON USE_HDF5=ON USE_ADIOS1=ON USE_ADIOS2=OFF
@@ -508,10 +516,12 @@ jobs:
508516
cmake
509517
-DCMAKE_BUILD_TYPE=Debug
510518
-DopenPMD_USE_MPI=$USE_MPI
519+
-DopenPMD_USE_JSON=$USE_JSON
511520
-DopenPMD_USE_HDF5=$USE_HDF5
512521
-DopenPMD_USE_ADIOS1=$USE_ADIOS1
513522
-DopenPMD_USE_ADIOS2=$USE_ADIOS2
514523
-DopenPMD_USE_PYTHON=OFF
524+
-DopenPMD_USE_LOGGING=OFF
515525
-DopenPMD_USE_INVASIVE_TESTS=ON
516526
$TRAVIS_BUILD_DIR
517527
- make -j 2
@@ -557,7 +567,7 @@ jobs:
557567
name: "openPMD/openPMD-api"
558568
description: "C++ & Python API for Scientific I/O with openPMD"
559569
notification_email: [email protected]
560-
build_command_prepend: "mkdir coverity_build; cd coverity_build; . ../.travis/download_samples.sh; cmake .. -DPYTHON_EXECUTABLE:FILEPATH=$(which python); cd .."
570+
build_command_prepend: "mkdir coverity_build; cd coverity_build; . ../.travis/download_samples.sh; cmake .. -DPYTHON_EXECUTABLE:FILEPATH=$(which python3); cd .."
561571
build_command: "make -C coverity_build -j 2"
562572
branch_pattern: coverity_scan
563573

0 commit comments

Comments
 (0)