Merge branch 'coveralls'

Sergio Oliveira
2 parents c9b39e42 d8b4f829
Showing 7 changed files with 17 additions and 13 deletions Show diff stats
.travis.yml
README.rst
colab/tests/settings.py
requirements_dev.txt
requirements_test.txt
setup.cfg
vagrant/provision.sh
@@ -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
@@ -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/<folder> 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
-from ..settings import *
+from ..settings import *  # noqa
  
  
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
@@ -0,0 +1,5 @@
+Whoosh==2.5.7
+coverage==3.7.1
+coveralls==0.5
+flake8==2.3.0
+-r requirements.txt
@@ -1,2 +0,0 @@
-Whoosh==2.5.7
-coverage==3.7.1
@@ -0,0 +1,2 @@
+[flake8]
+exclude = **/migrations/*,**/urls.py
@@ -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
...	...	@@ -7,7 +7,7 @@ env:
7	7	- DJANGO_VERSION=1.7.3
8	8
9	9	install:
10		- - pip install -r requirements_test.txt
	10	+ - pip install -r requirements_dev.txt
11	11	- pip install django==${DJANGO_VERSION}
12	12	- pip install -e .
13	13	- colab-init-config > settings.yaml
...	...	@@ -15,11 +15,11 @@ install:
15	15	- sudo cp settings.yaml /etc/colab/
16	16	- psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
17	17
18		-#before_script:
19		-# flake8 revproxy
	18	+before_script:
	19	+ flake8 colab
20	20
21	21	script:
22	22	./runtests.py
23	23
24		-#after_success:
25		-# coveralls
	24	+after_success:
	25	+ coveralls
...	...
...	...	@@ -76,16 +76,15 @@ desired location in environment variable COLAB_SETTINGS.
76	76	About test
77	77	==========
78	78
79		-How to write a tests.
	79	+How to write a test
80	80	--------------------
81	81	Inside of each folder on /vagrant/colab/<folder> you can create a folder called
82	82	"tests", and inside of it implements the code for test each file.
83	83
84		-How to run a test
85		------------------
	84	+How to run the tests
	85	+--------------------
86	86
87	87	Follow the steps below:
88	88
89	89	* Go to vagrant/colab/
90		-* Install the test dependencies with `pip install -r requirements_test.txt`
91	90	* run: ./runtests.sh
...	...
1		-from ..settings import *
	1	+from ..settings import * # noqa
2	2
3	3
4	4	STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
...	...
...	...	@@ -0,0 +1,5 @@
	1	+Whoosh==2.5.7
	2	+coverage==3.7.1
	3	+coveralls==0.5
	4	+flake8==2.3.0
	5	+-r requirements.txt
...	...
...	...	@@ -0,0 +1,2 @@
	1	+[flake8]
	2	+exclude = */migrations/,**/urls.py
...	...
...	...	@@ -24,7 +24,7 @@ for dir in /vagrant/colab /vagrant; do
24	24	break
25	25	fi
26	26	done
27		-pip install -r $basedir/requirements.txt
	27	+pip install -r $basedir/requirements_dev.txt
28	28	pip install -e $basedir
29	29
30	30	if [ ! -s /etc/colab/settings.yaml ]; then
...	...