From adb585e85b31e535084336f6d3552467dc4e452c Mon Sep 17 00:00:00 2001 From: Corey O'Brien Date: Sun, 8 Mar 2015 22:23:59 -0500 Subject: [PATCH] Consolidate build into .travis.yml and tweak to fix coveralls --- .travis.yml | 22 +++++----------------- REQUIREMENTS | 3 --- requirements-travis.txt | 4 ---- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 REQUIREMENTS delete mode 100644 requirements-travis.txt diff --git a/.travis.yml b/.travis.yml index 0b33eff..d52a9b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,28 +8,16 @@ install: - sudo apt-get update -y # install aptitude packages - - LDFLAGS=-lm sudo apt-get install -y $(< requirements-travis.txt) + - LDFLAGS=-lm sudo apt-get install -y libevent-dev - # install python requirements - - make setup - - pip install coveralls - - # weird travis-ci python paths - - export PYTHONPATH=$PYTHONPATH:/usr/lib/pymodules/python2.7/ - - export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.7/dist-packages - - export PYTHONPATH=$PYTHONPATH:/usr/lib/pyshared/python2.7/ - - export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages/ + # install pyvows + - pip install --upgrade --editable .[tests] - # verify requirements were met - - INSTALLDIR=$(python -c "import os; import gevent; print(os.path.dirname(gevent.__file__))") + # install coveralls + - pip install coveralls script: - - export PYTHONPATH=$PYTHONPATH:/usr/lib/pymodules/python2.7/ - - export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.7/dist-packages - - export PYTHONPATH=$PYTHONPATH:/usr/lib/pyshared/python2.7/ - - export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages/ - # finally run tests - env PYTHONPATH=. coverage run --source=pyvows ./pyvows/__main__.py diff --git a/REQUIREMENTS b/REQUIREMENTS deleted file mode 100644 index 8f768c1..0000000 --- a/REQUIREMENTS +++ /dev/null @@ -1,3 +0,0 @@ -gevent -argparse -preggy diff --git a/requirements-travis.txt b/requirements-travis.txt deleted file mode 100644 index cc2cc59..0000000 --- a/requirements-travis.txt +++ /dev/null @@ -1,4 +0,0 @@ -libevent-dev -libxml2-dev -libcurl4-gnutls-dev -python-pycurl-dbg