Skip to content

Commit 5824cb4

Browse files
author
Sylvain MARIE
committed
Fixed travis build for python 2.7
1 parent 5b17eb7 commit 5824cb4

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ env:
2222

2323
before_install:
2424
# (a) linux dependencies
25-
- sudo apt-get install pandoc
2625
- sudo apt-get install ant
27-
- sudo apt-get install ant-optional
26+
- sudo apt-get install ant-optional # for junitreports
2827

2928
install:
3029
- pip list
31-
# needs to be installed beforehand
32-
- pip install setuptools_scm
30+
- pip install six setuptools_scm # apparently python 2 requires this
3331
- python ci_tools/py_install.py pip ci_tools/requirements-pip.txt
32+
# this does not work anymore on python 2 so lets only do it when needed
33+
- if [ "${TRAVIS_PYTHON_VERSION}" = "3.5" ]; then pip install mkdocs-material mkdocs; fi;
3434
- |
3535
if [ "${TRAVIS_PYTHON_VERSION}" = "2.7" ]; then
3636
echo "No need to install enforce pytypes"

ci_tools/requirements-pip.txt

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

2222
# --- to generate the doc (see .travis)
23-
mkdocs-material #==3.3.0
24-
mkdocs # ==1.0.4 # this is to prevent a version non-compliant with mkdocs-material to be installed.
23+
# does not work on python 2 > NOW DONE IN TRAVIS
24+
# mkdocs-material #==3.3.0
25+
# mkdocs # ==1.0.4 # this is to prevent a version non-compliant with mkdocs-material to be installed.

0 commit comments

Comments
 (0)