Merge branch 'master' into feature/evl-djdb

.travis.yml

@@ -1,7 +1,9 @@
 language: python
 sudo: false
 env:
+    - TOXENV=doc8
     - TOXENV=flake8
+    - TOXENV=pep257
     - TOXENV=py27
     - TOXENV=py32
     - TOXENV=py33
@@ -12,3 +14,10 @@ script:
     - tox -e $TOXENV
 matrix:
     fast_finish: true
+notifications:
+    email: false
+    irc:
+        channels:
+            - "chat.freenode.net#django12factor"
+        skip_join: true
+        use_notice: true

README.rst

@@ -8,6 +8,14 @@ django-12factor
        :target: https://landscape.io/github/doismellburning/django12factor/master
        :alt: Code Health
 
+.. image:: https://requires.io/github/doismellburning/django12factor/requirements.svg?branch=master
+       :target: https://requires.io/github/doismellburning/django12factor/requirements/?branch=master
+       :alt: Requirements Status
+
+.. image:: https://coveralls.io/repos/doismellburning/django12factor/badge.svg
+       :target: https://coveralls.io/r/doismellburning/django12factor
+       :alt: Coverage Status
+
 What is it?
 -----------
 

requirements-test.txt

@@ -0,0 +1,7 @@
+coverage==3.7.1
+coveralls==0.5
+git+https://github.com/doismellburning/doc8.git@feature/display-line-lengths
+flake8==2.3.0
+nose==1.3.4
+pep257==0.4.1
+pygments==2.0.2

tox.ini

@@ -2,6 +2,7 @@
 envlist =
 	doc8,
 	flake8,
+	pep257,
 	py27,
 	py32,
 	py33,
@@ -10,22 +11,23 @@ envlist =
 
 [testenv]
 deps =
-	nose
-	coverage
+	-rrequirements-test.txt
 commands =
 	coverage run {envdir}/bin/nosetests
 	coverage report
+	coveralls
 
 
 [testenv:flake8]
-deps = flake8
 commands =
 	flake8 django12factor tests setup.py
 
 
 [testenv:doc8]
-deps =
-	git+https://github.com/doismellburning/doc8.git@feature/display-line-lengths
-	pygments
 commands =
 	doc8 README.rst
+
+
+[testenv:pep257]
+commands =
+	pep257 --ignore D100,D101,D102,D103,D200,D202,D203 django12factor tests