Make requirements-dev.txt include requirements.txt

g711ab · May 27, 2016 · b32fd04 · b32fd04
1 parent 86344b7
commit b32fd04
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -2,7 +2,7 @@ formats:
         - htmlzip
         - pdf
         - epub
-requirements_file: requirements.txt
+requirements_file: requirements-dev.txt
 python:
         version: 2
         setup_py_install: true
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,3 +1,4 @@
+-r requirements.txt
 flake8==2.5.0
 mock==1.0.1
 pep8==1.5.7

diff --git a/tox.ini b/tox.ini
@@ -9,7 +9,6 @@ indexserver =
 setenv=
     TZ = UTC
 deps =
-    --requirement={toxinidir}/requirements.txt
     --requirement={toxinidir}/requirements-dev.txt
     --editable={toxinidir}
 commands =
@@ -21,7 +20,6 @@ setenv=
     TZ = UTC
 basepython = python2.7
 deps =
-    --requirement={toxinidir}/requirements.txt
     --requirement={toxinidir}/requirements-dev.txt
     --editable={toxinidir}
 commands =