CI: Use reorder-python-imports

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 81a712109d5d908fd83c177045cc15c92b596539..2f1c3ce42ed68f6771596e78359b3a0f9c89d355 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,6 +28,11 @@ repos:
         args: ['--fix=lf']
     -   id: trailing-whitespace
 
+-   repo: https://github.com/asottile/reorder-python-imports
+    rev: v3.12.0
+    hooks:
+    -   id: reorder-python-imports
+
 -   repo: local
     hooks:
     -   id: git-diff # https://github.com/pre-commit/pre-commit/issues/1712

diff --git a/build/mkcfg.py b/build/mkcfg.py
index 7f8e3d52051fc23794b50d902cb32c5b077ca2c3..c1a2e193dd62b34a1f17cf5ebc9a280176715322 100755 (executable)
--- a/build/mkcfg.py
+++ b/build/mkcfg.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
 """
 Construct an xl configuration file for a test (from various fragments), and
 substitue variables appropriately.
 """
-
-import sys, os
+import os
+import sys
 
 # Usage: mkcfg.py $OUT $DEFAULT-CFG $EXTRA-CFG $VARY-CFG
 _, out, defcfg, vcpus, extracfg, varycfg = sys.argv

diff --git a/build/mkinfo.py b/build/mkinfo.py
index 50819e2c53cafe44aaaa8cbeecdb033ada2118fe..1c9c1ad17d8362b8b39641d7d606eb082a819fbe 100755 (executable)
--- a/build/mkinfo.py
+++ b/build/mkinfo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-import sys, json
+import json
+import sys
 
 # Usage: mkcfg.py $OUT $NAME $CATEGORY $ENVS $VARIATIONS
 _, out, name, cat, envs, variations = sys.argv

diff --git a/xtf-runner b/xtf-runner
index 772e6880fc866f6a7a4cb35aab76b734c6dc2477..138f3b1cfeb98757dd9d91ecb66dcdda1c9bbe2f 100755 (executable)
--- a/xtf-runner
+++ b/xtf-runner
@@ -1,18 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
 """
 xtf-runner - A utility for enumerating and running XTF tests.
 
 Currently assumes the presence and availability of the `xl` toolstack.
 """
-
-from __future__ import print_function, unicode_literals
+from __future__ import print_function
+from __future__ import unicode_literals
 
 import json
-import sys, os
+import os
 import subprocess
-
+import sys
 from functools import partial
 from optparse import OptionParser
 from os import path