From f2fae5feca94a4276e69051d2821b697e45b1148 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 7 May 2017 14:50:49 +0300 Subject: [PATCH] Move hard requirements from tox.ini to requirements.txt --- project_template/devscripts/requirements/requirements.txt | 4 ++++ project_template/tox.ini | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project_template/devscripts/requirements/requirements.txt b/project_template/devscripts/requirements/requirements.txt index 7afd248..0af882c 100644 --- 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 813f34a..c19b8ec 100644 --- 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 = -- 2.39.2