From 90bdfa29fa74352dd24bf6e41a46613f816face7 Mon Sep 17 00:00:00 2001
From: Martin Curlej <mcurlej@redhat.com>
Date: Jan 10 2018 13:12:11 +0000
Subject: Added tox support.


Signed-off-by: Martin Curlej <mcurlej@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index d1472e0..850825d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ report.xml
 .cache/
 *.egg-info/
 *__pycache__/
+.tox/
+module_diffc
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..0acb5f3
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+global-exclude *.pyc *.pyo
+include LICENSE
+include README.rst
+include requirements.txt
+include test-requirements.txt
diff --git a/README.md b/README.md
index 5252d4d..963c1a3 100644
--- a/README.md
+++ b/README.md
@@ -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 @@ python setup.py develop
 
 To run tests do:
 ```
-python -m pytest -s
+tox -e py27,py36,flake8
 ```
 
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index e17f49c..5a90eb3 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -22,12 +22,12 @@ def generate_module_res(pdc_json_res):
         "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
diff --git a/tests/test_module.py b/tests/test_module.py
index 63342d6..cc415a4 100644
--- a/tests/test_module.py
+++ b/tests/test_module.py
@@ -54,12 +54,12 @@ class TestModule(object):
             "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 @@ class TestModule(object):
         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 @@ class TestModule(object):
         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 @@ class TestModule(object):
         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):
         """
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..128ee54
--- /dev/null
+++ b/tox.ini
@@ -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
+