Merge pull request #98 from messense/develop

dongweiming · dongweiming · commit d9bdae4b26ff · 2015-07-02T22:40:29.000+08:00
Development settings update
diff --git a/.env b/.env
@@ -0,0 +1,4 @@
+#!/bin/bash
+if [ -e ./venv/bin/activate ]; then
+    source ./venv/bin/activate
+fi
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,3 +1,4 @@
+-r requirements.txt
 ipython
 flake8
 autopep8
diff --git a/tox.ini b/tox.ini
@@ -8,9 +8,8 @@ envlist = py27, pypy
 
 [base]
 deps =
-  -r{toxinidir}/requirements.txt
-  -r{toxinidir}/py2-requirements.txt
   -r{toxinidir}/dev-requirements.txt
+  -r{toxinidir}/py2-requirements.txt
 
 [testenv]
 usedevelop = true
