PR#4245: combination of test-requirments(-py2).txt - koji

Yuming Zhu • 15 days ago

4f9db4e

docs/source/writing_koji_code.rst

file modified

+1 -1

		`@@ -749,7 +749,7 @@`
		* ``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

file removed

-10

test-requirements.txt

file modified

+7 -11

		`@@ -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

file modified

+3 -2

		`@@ -4,6 +4,7 @@`
		`[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 @@`

		`[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 @@`
		`# 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 =`