From 20383f0df33c40cc565063ea8b87d5c202d4e60d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 14 Jul 2019 21:36:05 +0200 Subject: [PATCH] package/ci: build for Python 3.7 and pybind 2.3 as well, drop 3.4 build. --- CONTRIBUTING.rst | 6 +++--- doc/build-status.html.in | 9 +++------ package/ci/setup-pybind11.sh | 8 ++++---- package/ci/travis.yml | 28 +++++++++++++++++++--------- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index cab62684..32057e93 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -121,9 +121,9 @@ Test organization: files named ``test_something.py`` take their input from case of Doxygen, comment-out the line that removes the ``html`` directory in ``__init__.py`` to see all test output files. -The project is built on Travis CI on Linux with Python 3.4, 3.5 and 3.6; -Doxygen theme is tested only on 3.6 and math rendering is disabled as it's -impossible to get it working on Travis (https://github.com/mosra/m.css/pull/75). +The project is built on Travis CI on Linux with Python 3.5, 3.6 and 3.7; +documentation themes are tested only on 3.6+ and math rendering is disabled as +it's impossible to get it working on Travis (https://github.com/mosra/m.css/pull/75). Build and coverage status is presented at https://mcss.mosra.cz/build-status/. Contact diff --git a/doc/build-status.html.in b/doc/build-status.html.in index a3447f51..66a90d81 100644 --- a/doc/build-status.html.in +++ b/doc/build-status.html.in @@ -2,9 +2,9 @@ - Python
3.4 Python
3.5 Python
3.6 + Python
3.7 code coverage @@ -14,27 +14,24 @@ Pelican theme -  
   
   
  +  
  Plugins Graph rendering - Documentation themes - Documentation themes
client search - -  
  +  
  Math rendering diff --git a/package/ci/setup-pybind11.sh b/package/ci/setup-pybind11.sh index b3cbbdcf..d952b6fc 100755 --- a/package/ci/setup-pybind11.sh +++ b/package/ci/setup-pybind11.sh @@ -1,12 +1,12 @@ set -e -wget --no-clobber https://github.com/pybind/pybind11/archive/v2.2.4.tar.gz && tar -xzf v2.2.4.tar.gz +wget --no-clobber https://github.com/pybind/pybind11/archive/v$PYBIND_VERSION.tar.gz && tar -xzf v$PYBIND_VERSION.tar.gz -cd pybind11-2.2.4 +cd pybind11-$PYBIND_VERSION mkdir -p build && cd build cmake .. \ - -DCMAKE_INSTALL_PREFIX=$HOME/pybind11 \ - -DPYBIND11_PYTHON_VERSION=3.6 \ + -DCMAKE_INSTALL_PREFIX=$HOME/pybind$PYBIND_VERSION \ + -DPYBIND11_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION \ -DPYBIND11_TEST=OFF \ -G Ninja ninja install diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 29c66374..b88b4794 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -4,13 +4,6 @@ dist: xenial matrix: include: - - language: python - python: 3.4 - env: - - WITH_THEME=ON - - WITH_DOCUMENTATION=OFF - - WITH_NODE=OFF - - JOBID=py34 - language: python python: 3.5 addons: @@ -35,7 +28,23 @@ matrix: - WITH_DOCUMENTATION=ON - WITH_NODE=OFF - TRAVIS_BROKEN_MATPLOTLIB_SEED=YES + - PYBIND_VERSION=2.2.4 - JOBID=py36 + - language: python + python: 3.7 + addons: + apt: + packages: + - graphviz + - cmake + - ninja-build + env: + - WITH_THEME=ON + - WITH_DOCUMENTATION=ON + - WITH_NODE=OFF + - TRAVIS_BROKEN_MATPLOTLIB_SEED=YES + - PYBIND_VERSION=2.3.0 + - JOBID=py37 - language: node_js node_js: 8 env: @@ -66,7 +75,7 @@ script: # pybind11 tests. Math rendering is not tested as dvisvgm is unusable even on # 16.04. - if [ "$WITH_DOCUMENTATION" == "ON" ] && [ ! -f $HOME/pybind11/include ]; then $TRAVIS_BUILD_DIR/package/ci/setup-pybind11.sh; fi - - if [ "$WITH_DOCUMENTATION" == "ON" ]; then cd $TRAVIS_BUILD_DIR/documentation/test_python && mkdir -p build && cd build && cmake -DCMAKE_PREFIX_PATH=$HOME/pybind11 -DPYBIND11_PYTHON_VERSION=3.6 -G Ninja .. && ninja; fi + - if [ "$WITH_DOCUMENTATION" == "ON" ]; then cd $TRAVIS_BUILD_DIR/documentation/test_python && mkdir -p build && cd build && cmake -DCMAKE_PREFIX_PATH=$HOME/pybind$PYBIND_VERSION -DPYBIND11_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION -G Ninja .. && ninja; fi - if [ "$WITH_DOCUMENTATION" == "ON" ]; then cd $TRAVIS_BUILD_DIR/documentation && coverage run -m unittest && cp .coverage ../.coverage.doxygen; fi # Test client doxygen JS @@ -82,7 +91,8 @@ script: cache: directories: - $HOME/bin - - $HOME/pybind11 + - $HOME/pybind2.2.4 + - $HOME/pybind2.3.0 notifications: webhooks: -- 2.30.2