Skip to content

Commit 0c6c0fb

Browse files
committed
Don't make the Travis project be a Python one, it causes problems
1 parent 966e8ee commit 0c6c0fb

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

.travis.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
language: python
2-
3-
# We need Python 3 for the tests, but, if we add Python 3 here, it will be installed
4-
# in a virtualenv where bin/python points to Python 3.
1+
# We need Python 3 for the tests, but, if we add Python 3 as a language, it will be
2+
# installed in a virtualenv where bin/python points to Python 3.
53
# Then "python clang-format-diff" is spawned and this ends up using Python 2 instead
64
# of the required Python 2.7.
7-
# So we create the virtualenv with Python 2.7 and install manually Python 3 which
8-
# will be used by the tests.
9-
# This is hacky, but good enough to get stuff running.
10-
python:
11-
- "2.7"
5+
language: generic
126

137
before_install:
148
- sudo apt-get update
159
# coreutils is for readlink.
10+
# Python 2.7 for clang-format-diff.
1611
# Python 3.4 for the actual tests.
1712
- >
1813
sudo apt-get install -y \
19-
coreutils \
2014
clang-format-3.8 \
15+
coreutils \
16+
python2.7 \
2117
python3-pip \
2218
python3.4
2319
- sudo pip3 install pylint

0 commit comments

Comments
 (0)