Browse Source

Add file for global python requirements

Hamilton Turner 11 years ago
parent
commit
3ad5b19cda
3 changed files with 8 additions and 6 deletions
  1. 7 3
      .travis.yml
  2. 1 0
      config/python_requirements.txt
  3. 0 3
      toolset/setup/linux/prerequisites.sh

+ 7 - 3
.travis.yml

@@ -152,19 +152,23 @@ env:
     - "TESTDIR=Ur/urweb"
 
 before_install:
+  # Need to install python modules before using 
+  # python
+  - pip install -r config/python_requirements.txt
+
   # Configure Travis-CI build environment for TFB
   #   e.g. setup databases, users, etc
-  - time ./toolset/run-ci.py cisetup "$TESTDIR"
+  - ./toolset/run-ci.py cisetup "$TESTDIR"
 
 addons:
   postgresql: "9.3" 
 
 install:
   # Install prerequisites
-  - time ./toolset/run-ci.py prereq "$TESTDIR"
+  - ./toolset/run-ci.py prereq "$TESTDIR"
   
   # Install software for this framework  
-  - time ./toolset/run-ci.py install "$TESTDIR"
+  - ./toolset/run-ci.py install "$TESTDIR"
    
 script: 
   # Pick one test in this directory and verify

+ 1 - 0
config/python_requirements.txt

@@ -0,0 +1 @@
+colorama

+ 0 - 3
toolset/setup/linux/prerequisites.sh

@@ -36,9 +36,6 @@ sudo apt-get -y install \
   libjson0-dev libmcrypt-dev libicu-dev gettext \
   libpq-dev mlton cloc dstat
 
-# For cross-platform colored stdout/stderr messages
-sudo pip install colorama
-
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo apt-get -y update
 sudo apt-get install -y gcc-4.8 g++-4.8