diff --git a/.travis.yml b/.travis.yml index c85e204..3475621 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - DJANGO_VERSION=1.7.3 install: - - pip install -r requirements_test.txt + - pip install -r requirements_dev.txt - pip install django==${DJANGO_VERSION} - pip install -e . - colab-init-config > settings.yaml @@ -15,11 +15,11 @@ install: - sudo cp settings.yaml /etc/colab/ - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres -#before_script: -# flake8 revproxy +before_script: + flake8 colab script: ./runtests.py -#after_success: -# coveralls +after_success: + coveralls diff --git a/README.rst b/README.rst index 5b22434..ec5da4e 100644 --- a/README.rst +++ b/README.rst @@ -76,16 +76,15 @@ desired location in environment variable **COLAB_SETTINGS**. About test ========== -How to write a tests. +How to write a test -------------------- Inside of each folder on /vagrant/colab/ you can create a folder called "tests", and inside of it implements the code for test each file. -How to run a test ------------------ +How to run the tests +-------------------- Follow the steps below: * Go to vagrant/colab/ -* Install the test dependencies with `pip install -r requirements_test.txt` * run: ./runtests.sh diff --git a/requirements_dev.txt b/requirements_dev.txt new file mode 100644 index 0000000..a32671a --- /dev/null +++ b/requirements_dev.txt @@ -0,0 +1,5 @@ +Whoosh==2.5.7 +coverage==3.7.1 +coveralls==0.5 +flake8==2.3.0 +-r requirements.txt diff --git a/requirements_test.txt b/requirements_test.txt deleted file mode 100644 index 31e68f1..0000000 --- a/requirements_test.txt +++ /dev/null @@ -1,2 +0,0 @@ -Whoosh==2.5.7 -coverage==3.7.1 diff --git a/vagrant/provision.sh b/vagrant/provision.sh index 7c14877..e668ac0 100755 --- a/vagrant/provision.sh +++ b/vagrant/provision.sh @@ -24,7 +24,7 @@ for dir in /vagrant/colab /vagrant; do break fi done -pip install -r $basedir/requirements.txt +pip install -r $basedir/requirements_dev.txt pip install -e $basedir if [ ! -s /etc/colab/settings.yaml ]; then -- libgit2 0.21.2