From a642a05bb927522602103d56847b2b4470d467f1 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Jan 06 2021 12:25:02 +0000
Subject: [PATCH 1/2] Python3 compatibility changes.


---

diff --git a/playbook/setup.yaml b/playbook/setup.yaml
index 588c7bd..2beb20a 100644
--- a/playbook/setup.yaml
+++ b/playbook/setup.yaml
@@ -24,13 +24,13 @@
         - texinfo
         - dos2unix
         - dpkg
-        - python2-devel
+        - python3-devel
         - rpm-python
-        - python2-mock
+        - python3-mock
         - koji
-        - python2-koji
-        - pyxdg
-        - python2-unittest2
+        - python3-koji
+        - python3-pyxdg
+        - python3-unittest2
         - wget
         - git
 
diff --git a/selfcheck.py b/selfcheck.py
index c4cbab8..bb67657 100755
--- a/selfcheck.py
+++ b/selfcheck.py
@@ -41,6 +41,7 @@ def main():
         'f25': 'fc25',
         'f24': 'fc24',
         'f23': 'fc23',
+        'f33': 'fc33',
     }
 
     fedabipkgdiff = program_arguments.fedabipkgdiff_prog
@@ -62,7 +63,7 @@ def main():
                          fed_release_target[fed_rel],
                          pkg)
 
-                print "Running '%s'" % cmd
+                print("Running '{}'".format(cmd))
                 sys.stdout.flush()
                 args = shlex.split(cmd)
                 proc = subprocess.Popen(args,
@@ -72,14 +73,14 @@ def main():
                 stdout, stderr = proc.communicate()
                 if stderr:
                     status = max(status, 1)
-                    print 'Error encountered while running fedabipkgdiff with '\
-                    'error message: \n %s' % stderr
+                    print('Error encountered while running fedabipkgdiff with '\
+                    'error message: \n {}'.format(stderr))
                     sys.stdout.flush()
                 else:
                     if proc.returncode == 0:
                         status = max(status, 0)
                     else:
-                        print stdout
+                        print(stdout)
                         status = max(status, 1)
                         return status
 

From 798532e05844ef8ac6e29c332ef32d83357ab061 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Jan 06 2021 16:49:08 +0000
Subject: [PATCH 2/2] Reduce build deps.


---

diff --git a/playbook/setup.yaml b/playbook/setup.yaml
index 2beb20a..8eb769d 100644
--- a/playbook/setup.yaml
+++ b/playbook/setup.yaml
@@ -25,12 +25,10 @@
         - dos2unix
         - dpkg
         - python3-devel
-        - rpm-python
         - python3-mock
         - koji
         - python3-koji
         - python3-pyxdg
-        - python3-unittest2
         - wget
         - git