From 085e93696fee83db831c875942b98b4ded7fa268 Mon Sep 17 00:00:00 2001
From: Emmanuel Jannetti <4819607+ejannett@users.noreply.github.com>
Date: Wed, 8 Apr 2020 10:45:34 +0200
Subject: [PATCH 1/2] remove flake8 dependency enforce use of python3

---
 buildrpm/oci-utils.spec | 1 -
 setup.cfg               | 2 --
 setup.py                | 6 +++++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildrpm/oci-utils.spec b/buildrpm/oci-utils.spec
index 14b25c90..a9b70500 100644
--- a/buildrpm/oci-utils.spec
+++ b/buildrpm/oci-utils.spec
@@ -17,7 +17,6 @@ BuildRequires: systemd
 
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
-#BuildRequires: python3-flake8
 Requires: python3
 Requires: python3-daemon
 Requires: python3-sdnotify
diff --git a/setup.cfg b/setup.cfg
index 3924a642..43cadc26 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,8 +3,6 @@ tag_build =
 tag_date = 0
 tag_svn_revision = 0
 
-[flake8]
-max-line-length = 120
 [pep8]
 max-line-length = 120
 
diff --git a/setup.py b/setup.py
index fe20dcba..d05f8ccf 100644
--- a/setup.py
+++ b/setup.py
@@ -335,6 +335,10 @@ def run(self):
             raise DistutilsExecError("rpmbuild execution failed")
 
 
+if sys.version_info.major < 3:
+    print('Only python verison 3 or above is supported')
+    sys.exit(1)
+
 setup(
     name="oci-utils",
     version="0.11.0",
@@ -347,7 +351,7 @@ def run(self):
     url="http://github.com/oracle/oci-utils/",
     package_dir={'': 'lib'},
     packages=find_packages('lib'),
-    setup_requires=["flake8"],
+    setup_requires=[],
     long_description=read('README'),
     test_suite="tests",
     data_files=[(os.path.join(sys.prefix, 'libexec'),

From eb45afb61666e3806b8635237d40e9075d4c4daf Mon Sep 17 00:00:00 2001
From: Emmanuel Jannetti <4819607+ejannett@users.noreply.github.com>
Date: Wed, 8 Apr 2020 11:02:13 +0200
Subject: [PATCH 2/2] revert build paths

---
 setup.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 43cadc26..7b477c8e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,10 +7,10 @@ tag_svn_revision = 0
 max-line-length = 120
 
 [sdist]
-dist-dir = /var/tmp/rpmbuild/SOURCES/
+dist-dir = rpmbuild/SOURCES/
 
 [create_rpm]
-rpm-top-dir = /var/tmp/rpmbuild
+rpm-top-dir = rpmbuild
 spec-file-path = buildrpm/oci-utils.spec
 
 [sync_rpm]