PR#8: Added tox support. - module_diff

module_diff

#8 Added tox support.

Merged 6 years ago by mcurlej. Opened 6 years ago by mcurlej.

mcurlej/module_diff tox_support into master

Martin Curlej • 6 years ago

90bdfa2

.gitignore

file modified

		`@@ -4,3 +4,5 @@`
		`.cache/`
		`*.egg-info/`
		`*__pycache__/`
		`+ .tox/`
		`+ module_diffc`

MANIFEST.in

file added

		`@@ -0,0 +1,5 @@`
		`+ global-exclude .pyc .pyo`
		`+ include LICENSE`
		`+ include README.rst`
		`+ include requirements.txt`
		`+ include test-requirements.txt`

README.md

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# module_diff`

		`- Creates diffs between 2 versions of module. Written in Python 3.`
		`+ Creates diffs between 2 versions of module. Written in Python 3, but is compatible with python 2.7.`

		`# Development`

		`@@ -22,7 +22,7 @@`

		`To run tests do:`
		```
		`- python -m pytest -s`
		`+ tox -e py27,py36,flake8`
		```

tests/test_cli.py

file modified

+6 -6

		`@@ -22,12 +22,12 @@`
		`"mariadb-connect-engine-3:10.2.9-3.module_629c669e.x86_64.rpm")`
		`module2_res["results"][0]["koji_tag"] = "module-15d35d06c29b1848"`
		`module2_res["results"][0]["rpms"] = [`
		`- "mariadb-debugsource-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-connect-engine-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-debuginfo-3:11.2.9-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-devel-3:9.2.9-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-connect-engine-3:10.2.9-3.module_15d35d06.x86_64.rpm"`
		`+ "mariadb-debugsource-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-connect-engine-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-debuginfo-3:11.2.9-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-devel-3:9.2.9-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-connect-engine-3:10.2.9-3.module_15d35d06.x86_64.rpm"`
		`]`

		`return module1_res, module2_res`

tests/test_module.py

file modified

+22 -22

		`@@ -54,12 +54,12 @@`
		`"mariadb-connect-engine-3:10.2.9-3.module_629c669e.x86_64.rpm")`
		`module2_res["results"][0]["koji_tag"] = "module-15d35d06c29b1848"`
		`module2_res["results"][0]["rpms"] = [`
		`- "mariadb-debugsource-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-connect-engine-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-debuginfo-3:11.2.9-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-devel-3:9.2.9-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-connect-engine-3:10.2.9-3.module_15d35d06.x86_64.rpm"`
		`+ "mariadb-debugsource-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-connect-engine-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-debuginfo-3:11.2.9-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-devel-3:9.2.9-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-connect-engine-3:10.2.9-3.module_15d35d06.x86_64.rpm"`
		`]`

		`with requests_mock.mock() as mock_http:`
		`@@ -89,13 +89,13 @@`
		`module2_res = pdc_json_res.get()`
		`module2_res["results"][0]["koji_tag"] = "module-15d35d06c29b1848"`
		`module2_res["results"][0]["rpms"] = [`
		`- "mariadb-3:10.2.9-3.module_629c669e.src.rpm",`
		`- "mariadb-debugsource-3:11.2.9-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-connect-engine-debuginfo-3:10.2.8-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-devel-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-connect-engine-3:10.2.9-3.module_629c669e.x86_64.rpm"`
		`+ "mariadb-3:10.2.9-3.module_629c669e.src.rpm",`
		`+ "mariadb-debugsource-3:11.2.9-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-connect-engine-debuginfo-3:10.2.8-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-devel-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-connect-engine-3:10.2.9-3.module_629c669e.x86_64.rpm"`
		`]`

		`with requests_mock.mock() as mock_http:`
		`@@ -168,13 +168,13 @@`
		`module2_res = pdc_json_res.get()`
		`module2_res["results"][0]["koji_tag"] = "module-15d35d06c29b1848"`
		`module2_res["results"][0]["rpms"] = [`
		`- "mariadb-3:10.2.9-3.module_629c669e.src.rpm",`
		`- "mariadb-debugsource-3:10.2.9-3.module_15d35d06.x86_64.rpm",`
		`- "mariadb-connect-engine-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-devel-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-connect-engine-3:10.2.9-3.module_629c669e.x86_64.rpm"`
		`+ "mariadb-3:10.2.9-3.module_629c669e.src.rpm",`
		`+ "mariadb-debugsource-3:10.2.9-3.module_15d35d06.x86_64.rpm",`
		`+ "mariadb-connect-engine-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-debuginfo-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-devel-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-connect-engine-3:10.2.9-3.module_629c669e.x86_64.rpm"`
		`]`

		`with requests_mock.mock() as mock_http:`
		`@@ -192,8 +192,8 @@`
		`assert diff["downgraded_rpms"] == []`
		`assert len(diff["reused_rpms"]) == 6`
		`assert diff["changed_distag_rpms"] == [`
		`- ("mariadb-debugsource-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`- "mariadb-debugsource-3:10.2.9-3.module_15d35d06.x86_64.rpm")]`
		`+ ("mariadb-debugsource-3:10.2.9-3.module_629c669e.x86_64.rpm",`
		`+ "mariadb-debugsource-3:10.2.9-3.module_15d35d06.x86_64.rpm")]`

		`def test_get_rpm_md(self, pdc_json_res):`
		`"""`

tox.ini

file added

+18

		`@@ -0,0 +1,18 @@`
		`+ [tox]`
		`+ envlist = py27, py36, flake8`
		`+`
		`+ [flake8]`
		`+ max-line-length = 100`
		`+`
		`+ [testenv]`
		`+ sitepackages = True`
		`+ deps = -r{toxinidir}/test-requirements.txt`
		`+ commands = py.test {posargs}`
		`+`
		`+ [testenv:flake8]`
		`+ basepython = python3`
		`+ skip_install = true`
		`+ deps = flake8`
		`+ commands = flake8 --ignore E731 --exclude .tox,.git module_diff/ tests/`
		`+ ignore_outcome = True`
		`+`