Move hard requirements from tox.ini to requirements.txt

diff --git a/project_template/devscripts/requirements/requirements.txt b/project_template/devscripts/requirements/requirements.txt
index 7afd2486190b3118272791c1e5fc7fcf4a5899bf..0af882c74e91951eaff46a1087ddc837e73c3cca 100644 (file)
--- a/project_template/devscripts/requirements/requirements.txt
+++ b/project_template/devscripts/requirements/requirements.txt
@@ -2,3 +2,7 @@
 --find-links=http://phdru.name/Software/Python/
 --install-option=-O2
 
+argparse; python_version == '2.6'
+m_lib.defenc >= 1.0
+m_lib >= 2.0; python_version >= '2.6' and python_version < '3.0'
+m_lib >= 3.0; python_version >= '3.3'

diff --git a/project_template/tox.ini b/project_template/tox.ini
index 813f34a18b795bd7cb67bd1ed9740904fa11ef2c..c19b8ec0e2ed1588bb5595061eed1b5d22a84229 100644 (file)
--- a/project_template/tox.ini
+++ b/project_template/tox.ini
@@ -16,11 +16,7 @@ commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    pytest
-    pytest-cov
-    py26: argparse
-    py2{6,7},pypy: m_lib>=2.0
-    py3{3,4,5,6}: m_lib>=3.0
+    -rdevscripts/requirements/requirements_tests.txt
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =