diff options
author | Stefan Giehl <stefan@piwik.org> | 2018-08-31 11:51:47 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 11:51:47 +0300 |
commit | 43ef12dbc7a7847292fb2adf57850c968e0b7f5f (patch) | |
tree | d8cb1a46652ffe2ed4a85cecdac13052d8a68c4a | |
parent | f5fdde394511956e02e4915bf6bc658f33f7d871 (diff) |
Use Python 2.7 for travis tests (#13282)
* use python 2.7
* adjust travis submodule
-rw-r--r-- | .travis.yml | 5 | ||||
-rw-r--r-- | tests/PHPUnit/Framework/Fixture.php | 2 | ||||
m--------- | tests/travis | 0 |
3 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index c350b40230..a9618ccc3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,7 @@ services: addons: apt: - sources: - - deadsnakes - packages: - - python2.6 - - python2.6-dev - nginx - realpath - lftp diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index efec12237e..c53809e193 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -140,7 +140,7 @@ class Fixture extends \PHPUnit_Framework_Assert } if (SystemTestCase::isTravisCI()) { - return 'python2.6'; + return 'python2.7'; } return 'python'; diff --git a/tests/travis b/tests/travis -Subproject f9b19b0f017a3f6c771d062c6948aabf7284a16 +Subproject e306645ff8ff8d9e0b966a14df1f50cc9b7ea99 |