package/ci: build for Python 3.7 and pybind 2.3 as well, drop 3.4 build.

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index cab6268489d603c92e05e91bd51451bf87abdafc..32057e93e932656035049bf561f890cc1befe010 100644 (file)
--- 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 a3447f51797817182c4feebd9445974f0cdc924f..66a90d81721d42f8f613ee567ae92168a88e429f 100644 (file)
--- a/doc/build-status.html.in
+++ b/doc/build-status.html.in
@@ -2,9 +2,9 @@
   <thead>
     <tr>
       <th style="border-bottom-width: 0;"></th>
-      <th>Python<br />3.4</th>
       <th>Python<br />3.5</th>
       <th>Python<br />3.6</th>
+      <th>Python<br />3.7</th>
     </tr>
     <tr>
       <th class="m-text-right m-text-middle" style="border-top-width: 0;">code coverage</th>
@@ -14,27 +14,24 @@
   <tbody>
     <tr>
       <th class="m-text-right">Pelican theme</th>
-      <td rowspan="2" id="mcss-py34"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
       <td rowspan="3" id="mcss-py35"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
       <td rowspan="4" id="mcss-py36"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td rowspan="4" id="mcss-py37"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
     </tr>
     <tr>
       <th class="m-text-right">Plugins</th>
     </tr>
     <tr>
       <th class="m-text-right">Graph rendering</th>
-      <td class="m-dim"></td>
     </tr>
     <tr>
       <th class="m-text-right">Documentation themes</th>
       <td class="m-dim"></td>
-      <td class="m-dim"></td>
     </tr>
     <tr>
       <th class="m-text-right">Documentation themes<br/>client search</th>
       <td class="m-dim"></td>
-      <td class="m-dim"></td>
-      <td id="mcss-js"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td id="mcss-js" colspan="2"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
     </tr>
     <tr>
       <th class="m-text-right">Math rendering</th>

diff --git a/package/ci/setup-pybind11.sh b/package/ci/setup-pybind11.sh
index b3cbbdcfa21d522291be4a17840bab2a67d1a84c..d952b6fc6cef767ed29d7a03a35a178b4a58e0bc 100755 (executable)
--- 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 29c6637449ff5948fec4e6496400db90e8acf17b..b88b47949d923369d135eb608bd77a07fff7cbdd 100644 (file)
--- 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: