combination of test-requirments(-py2).txt

docs/source/writing_koji_code.rst

@@ -749,7 +749,7 @@ For py2 instances:
  * ``python-psycopg2``
  * ``tox``
  * ``pip==9.0.1``
- * ``Other packages are installed by test-requirements-py2.txt.``
+ * ``Other packages are installed by test-requirements.txt.``
 
 You can use containers for the tests. Dockerfiles are placed in `devtools/containers` directory.
 Supported Dockerfiles:

test-requirements-py2.txt

@@ -1,10 +0,0 @@
--e .
-flake8
-flake8-import-order
-mock<=2.0.0
-requests-mock<1.11.0
-coverage
-pytest
-Cheetah
-python-multilib
-python-qpid-proton<0.38.0

test-requirements.txt

@@ -1,14 +1,10 @@
 -e .
-defusedxml
-flake8
-flake8-import-order
-requests-mock
+-r requirements.txt
+mock<=2.0.0;python_version < '3.3'
+requests-mock;python_version >= '3.0'
+requests-mock<1.11.0;python_version < '3.0'
 coverage
 pytest
-pytest-cov
-pytest-xdist
-Cheetah3
-psycopg2-binary
-python-multilib
-python-qpid-proton
-setuptools
+pytest-cov;python_version >= '3.0'
+pytest-xdist;python_version >= '3.0'
+setuptools;python_version >= '3.0'

tox.ini

@@ -4,6 +4,7 @@ envlist = flake8,py2,py3,bandit
 [testenv:flake8]
 deps =
     flake8
+    flake8-import-order
 # On EL6, pip would get us a flake8 that doesn't work with python2.6. The next
 # two lines let us use an RPM-based version from EPEL if it is installed
 sitepackages = true
@@ -47,7 +48,7 @@ commands =
 
 [testenv:py2]
 deps =
-    -r{toxinidir}/test-requirements-py2.txt
+    -r{toxinidir}/test-requirements.txt
 setenv =
     {[testenv]setenv}
     PYTHONPATH=.:plugins/builder/.:plugins/cli/.:cli/.:www/lib
@@ -71,7 +72,7 @@ commands =
 # dependencies must be installed.
 [testenv:py2-rpmdeps]
 deps =
-    -r{toxinidir}/test-requirements-py2.txt
+    -r{toxinidir}/test-requirements.txt
 setenv =
     {[testenv:py2]setenv}
 commands_pre =