aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Taves <mwtoews@gmail.com>2019-04-05 17:25:44 +1300
committerMike Taves <mwtoews@gmail.com>2019-04-05 17:47:34 +1300
commitce0c1164626b6d908f5cf58bac65f5fed24b908d (patch)
treeb5d4ad24ca777aec2323830f7a5f76d9c143f417
parent2c28ca1798cb24b803c44ceebd34bb3f15822c87 (diff)
downloadPROJ-ce0c1164626b6d908f5cf58bac65f5fed24b908d.tar.gz
PROJ-ce0c1164626b6d908f5cf58bac65f5fed24b908d.zip
Disable status bars from 'pip install'
Also simplify language for .travis.yml
-rw-r--r--.travis.yml7
-rwxr-xr-xtravis/before_install.sh4
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index d30c79cd..79a78611 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
# This is the config file for building proj.4 and running its test suite
# with Travis-ci.org
+language: cpp
branches:
except:
@@ -16,7 +17,6 @@ matrix:
- os: linux
dist: trusty
compiler: gcc
- language: cpp
sudo: required
services:
- docker
@@ -26,6 +26,7 @@ matrix:
- os: linux
dist: trusty
+ compiler: gcc
sudo: required
services:
- docker
@@ -44,7 +45,6 @@ matrix:
- os: linux
dist: trusty
compiler: clang
- language: cpp
sudo: required
services:
- docker
@@ -53,7 +53,6 @@ matrix:
- DETAILS="linux, clang"
- os: osx
- language: cpp
env:
- BUILD_NAME=osx
- DETAILS="osx"
@@ -61,7 +60,6 @@ matrix:
- os: linux
dist: trusty
compiler: gcc
- language: cpp
sudo: required
env:
- BUILD_NAME=mingw32
@@ -69,7 +67,6 @@ matrix:
- os: linux
compiler: gcc
- language: cpp
dist: trusty
sudo: required
env:
diff --git a/travis/before_install.sh b/travis/before_install.sh
index ac45a6d4..59b5be9f 100755
--- a/travis/before_install.sh
+++ b/travis/before_install.sh
@@ -2,3 +2,7 @@
# All platform-specific before_install scripts starts by running this
# "global" before_install script.
+
+# Configure Python pip
+pip install --user --upgrade pip
+pip config --user set global.progress_bar off