cleanup travis.yml

Include pip requirements.txt files and pin versions where needed
No double venv

1 files changed, 16 insertions, 41 deletions

diff --git a/.travis.yml b/.travis.yml
index 6aa9eb63..4b05b65f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,50 +1,25 @@
 sudo: false
-dist: trusty
 language: python
-python:
-- "2.7"
+python: 2.7
 addons:
-    apt:
-        sources: ['llvm-toolchain-trusty-6.0', 'ubuntu-toolchain-r-test']
-        packages:
-            - make
-            - gcc
-            - python-virtualenv
-            - unzip
-            - llvm-6.0
-            - llvm-6.0-dev
-            - g++-5
+  apt:
+    sources: ['llvm-toolchain-trusty-6.0', 'ubuntu-toolchain-r-test']
+    packages:
+      - make
+      - gcc
+      - python-virtualenv
+      - unzip
+      - llvm-6.0
+      - llvm-6.0-dev
+      - g++-5
+env: CXX=g++-5 LLVM_CONFIG=llvm-config-6.0
 before_script:
+- pip install -r optional_requirements.txt
 # codespell
 - "pip install codespell && git ls-files | xargs codespell --ignore-words=.codespell_ignore 2>/dev/null"
-- "cd .."
-- "export LLVM_CONFIG=$(which llvm-config-6.0)"
-- "export CXX=$(which g++-5)"
-# make virtual env
-- "python /usr/lib/python2.7/dist-packages/virtualenv.py virtualenv;"
-- "cd virtualenv;"
-- "source bin/activate;"
-# install llvmlite
-- "pip install enum34"
-- "pip install llvmlite"
-# install elfesteem
-- "git clone https://github.com/serpilliere/elfesteem elfesteem && cd elfesteem && python setup.py install && cd ..;"
-# install pyparsing
-- "pip install pyparsing"
-# install pycparser
-- "pip install pycparser"
-# install z3 with a known to working version
-- "wget https://github.com/serpilliere/z3-prebuild/raw/master/z3.tgz"
-- "tar xzf z3.tgz"
-- "cd z3/build"
-- "make install"
-- "cd ../.."
-# Miasm
-- "cd ..;"
-- "cd miasm;"
 # turn deprecation warning into RuntimeError
 - "find . -name '*.py' | xargs sed -i 's/warnings\\.warn(/raise RuntimeError(/g'"
 # install
-- "python setup.py build build_ext -I$(pwd)/../virtualenv/include -L$(pwd)/../virtualenv/tinycc"
-- "python setup.py install"
-script: "python -c 'import z3; x = z3.BitVec(chr(0x41), 32)' && cd test && python test_all.py && git ls-files -o --exclude-standard"
+- python setup.py build build_ext
+- python setup.py install
+script: cd test && python test_all.py && git ls-files -o --exclude-standard