Use pip2 for OSX, php 7.2 for Windows

This commit is contained in:
Steven Zeck 2018-01-02 23:32:49 -06:00
parent 8de12b9777
commit a60ba02a7a
2 changed files with 7 additions and 7 deletions

View File

@ -113,15 +113,15 @@ before_install:
pip install --user --upgrade autopep8;
pip install --user --upgrade isort;
else
pip install --upgrade pip;
pip install --upgrade autopep8;
pip install --upgrade isort;
pip2 install --upgrade pip2;
pip2 install --upgrade autopep8;
pip2 install --upgrade isort;
fi
# SQL language support
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pip install --user --upgrade sqlparse;
else
pip install --upgrade sqlparse;
pip2 install --upgrade sqlparse;
fi
# Java, C, C++, C#, Objective-C, D, Pawn, Vala
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@ -184,7 +184,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pip install --user beautysh;
else
pip install beautysh;
pip2 install beautysh;
fi
# terraform
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

View File

@ -107,8 +107,8 @@ install:
# PHP
- ps: Set-Service wuauserv -StartupType Manual
- cinst php -y
- ps: "ls \"C:\\tools\\php71\""
- "SET PATH=C:\\tools\\php71;%PATH%"
- ps: "ls \"C:\\tools\\php72\""
- "SET PATH=C:\\tools\\php72;%PATH%"
- where php
# PHP-CS-Fixer
- cinst curl -y # Use cURL to download file from URL