Skip to content

Commit 1b5afc6

Browse files
author
Sylvain MARIE
committed
Fixed build on python 2
1 parent e9a76a6 commit 1b5afc6

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ before_install:
2020
# (a) linux dependencies
2121
- sudo apt-get install pandoc
2222
- sudo apt-get install ant
23-
- sudo apt-get install ant-optional
23+
- sudo apt-get install ant-optional # for junitreports
2424

2525
install:
2626
- pip list
2727
# needs to be installed beforehand
2828
- pip install setuptools_scm
2929
- python ci_tools/py_install.py pip ci_tools/requirements-pip.txt
30+
# this does not work anymore on python 2 so lets only do it when needed
31+
- if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then pip install mkdocs-material mkdocs; fi;
3032
- |
3133
if [ "${TRAVIS_PYTHON_VERSION}" = "2.7" ]; then
3234
echo "No need to install enforce pytypes checktypes BUT need to install future"

ci_tools/requirements-pip.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ pytest-html==1.9.0 # otherwise requires pytest 5
2626
xunitparser
2727

2828
# --- to generate the doc (see .travis)
29-
mkdocs-material #==3.3.0
30-
mkdocs # ==1.0.4 # this is to prevent a version non-compliant with mkdocs-material to be installed.
29+
# does not work anymore on python 2
30+
# mkdocs-material # ==2.7.3
31+
# mkdocs # ==0.17.3 # this is to prevent a version non-compliant with mkdocs-material to be installed.

0 commit comments

Comments
 (0)