Style, linter and other checker fixes

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

scripts/koji/create_user_target.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import argparse
-import subprocess
 import logging
+import subprocess
 import sys
 
 def setup_logger():
@@ -34,4 +34,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-

scripts/koji/koji_import_rpms.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 import argparse
+import glob
 import os
 import subprocess
-import glob
 
 def get_srpm_info(srpmpath):
-    return subprocess.check_output(['rpm', '-qp', srpmpath, '--qf', '%{name};;%{nvr}']).split(';;')
+    return subprocess.check_output(['rpm', '-qp', srpmpath, '--qf', '%{name};;%{nvr}']).decode().split(';;')
 
 def check_dir(dirpath):
     if not os.path.isdir(dirpath):
@@ -19,11 +19,11 @@ def main():
     parser.add_argument('package_tags', help='comma-separated list of tags for the package(s)')
     parser.add_argument('build_tags', help='comma-separated list of tags for imported build(s)')
     parser.add_argument('--owner', help='owner for the package(s)', default='kojiadmin')
-    parser.add_argument('--create-build', help='create the build even if there\'s no SRPM', action='store_true', default=False)
+    parser.add_argument(
+        '--create-build', help='create the build even if there\'s no SRPM', action='store_true', default=False
+    )
     args = parser.parse_args()
 
-    DEVNULL = open(os.devnull, 'w')
-
     srpm_directory = os.path.abspath(check_dir(args.srpm_directory))
     rpm_directory = os.path.abspath(check_dir(args.rpm_directory))
 

scripts/koji/sync_repo_from_koji.py

@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 import argparse
-import re
-import os
-import sys
-import subprocess
+import atexit
 import glob
+import os
+import re
 import shutil
+import subprocess
+import sys
 import tempfile
-import atexit
-
 from datetime import datetime
+from subprocess import DEVNULL
 
 USER_REPO_HTTPS = "https://koji.xcp-ng.org/repos/user/"
 
@@ -21,7 +21,7 @@
     '8.3',
 ]
 
-DEV_VERSIONS = [
+DEV_VERSIONS: list[str] = [
 ]
 
 VERSIONS = DEV_VERSIONS + RELEASE_VERSIONS
@@ -62,7 +62,7 @@
     'v8.0-base',
     'v8.1-base',
     'v8.2-base',
-#    'v8.3-base', # special case: we have a history of pre-release builds that users might need for troubleshooting
+    # 'v8.3-base', # special case: we have a history of pre-release builds that users might need for troubleshooting
 ]
 
 # tags for which we want to export a stripped repo for offline updates
@@ -85,10 +85,9 @@
 
 KEY_ID = "3fd3ac9e"
 
-DEVNULL = open(os.devnull, 'w')
-
 def version_from_tag(tag):
     matches = re.match(r'v(\d+\.\d+)', tag)
+    assert matches is not None
     return matches.group(1)
 
 def repo_name_from_tag(tag):
@@ -215,7 +214,7 @@ def sign_unsigned_rpms(tag):
     for line in output.strip().splitlines():
         try:
             key, rpm = line.split(' ')
-        except:
+        except ValueError:
             # couldn't unpack values... no signature.
             continue
         if key == KEY_ID:
@@ -323,7 +322,9 @@ def offline_repo_dir():
                 print("\n-- Make koji write the repository for tag %s" % tag)
                 with_non_latest = [] if tag in RELEASE_TAGS else ['--non-latest']
                 sys.stdout.flush()
-                subprocess.check_call(['koji', 'dist-repo', tag, '3fd3ac9e',  '--with-src', '--noinherit'] + with_non_latest)
+                subprocess.check_call(
+                    ['koji', 'dist-repo', tag, '3fd3ac9e', '--with-src', '--noinherit'] + with_non_latest
+                )
 
                 # write repository to the appropriate destination directory for the tag
                 write_repo(tag, dest_dir_for_tag(tag), tmp_root_dir)

scripts/koji/untag_lone_builds.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-import koji
+import koji  # type: ignore
 
 config = koji.read_config("koji")
 s = koji.ClientSession('https://kojihub.xcp-ng.org', config)

scripts/koji/update_vendor_tags.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 import argparse
-import subprocess
 import json
 import os
 import re
-
-DEVNULL = open(os.devnull, 'w')
+import subprocess
+from subprocess import DEVNULL
 
 XS_buildhosts = [
     '1b68968c4e4e',
@@ -43,9 +42,9 @@ def update_vendor_tag_for_build(build, is_bootstrap=False):
     rpm_path = ""
     for line in output.splitlines():
         first_element = line.split()[0]
-        if re.match('.+/src/.+\.src\.rpm', first_element):
+        if re.match(r'.+/src/.+\.src\.rpm', first_element):
             srpm_path = ""
-        if re.match('.+\.rpm', first_element):
+        if re.match(r'.+\.rpm', first_element):
             rpm_path = first_element
 
     if not rpm_path:
@@ -62,7 +61,9 @@ def update_vendor_tag_for_build(build, is_bootstrap=False):
         ['rpm', '-qp', rpm_path, '--qf', '%{vendor};;%{buildhost}'], stderr=DEVNULL
     ).decode()
     vendor, buildhost = output.split(';;')
-    package = re.search('/packages/([^/]+)/', rpm_path).group(1)
+    rpm_match = re.search('/packages/([^/]+)/', rpm_path)
+    assert rpm_match is not None
+    package = rpm_match.group(1)
 
     tag = None
     if buildhost in XS_buildhosts:
@@ -121,6 +122,7 @@ def main():
     last_sync_event_filepath = os.path.join(data_dir, 'last_sync_event')
 
     need_update = True
+    timestamp = 0
     if os.path.exists(last_sync_event_filepath):
         with open(last_sync_event_filepath) as f:
             last_sync_event = json.loads(f.read())
@@ -129,9 +131,6 @@ def main():
             need_update = False
         else:
             timestamp = last_sync_event['ts']
-    else:
-        timestamp = 0 # first update ever
-
 
     if not need_update:
         if not quiet: