Revert "split out requirements file"

This reverts commit 3323046.
joealcorn · Sep 29, 2014 · 0c3166f · 0c3166f
1 parent 4b9ac80
commit 0c3166f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ python:
   - "pypy"
   - "pypy3"
 
-install: "pip install -r test-requirements.txt pytest-cov python-coveralls"
+install: "pip install pytest==2.6.2 pytest-cov python-coveralls pytest-pep8==1.0.6 betamax==0.4.1"
 
 script: py.test xbox/ --pep8 -v --cov xbox --cov-report term-missing
 after_success:

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,5 +1,8 @@
--r test-requirements.txt
+betamax==0.4.1
+pytest-pep8==1.0.6
+pytest==2.6.2
 sphinx-rtd-theme==0.1.6
 Sphinx==1.2.3
+tox==1.7.2
 twine==1.3.1
 wheel
diff --git a/test-requirements.txt b/test-requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,8 @@ envlist = py26,py27,py31,py32,py33,py34,pypy,pypy3
 
 [testenv]
 deps=
-    -rtest-requirements.txt
+    pytest-pep8==1.0.6
+    pytest==2.6.2
+    betamax==0.4.1
 commands=
   py.test xbox/ --pep8 --basetemp={envtmpdir} {posargs}