Sort Python imports with isort 5.13.2

Add isort 5.13.2 (the current version) as a dev dependency and run it on
all files.

Change-Id: If1b65c91ec05bb0fccad46c8d5e84adaad09d6cf
Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>

diff --git a/automation/ansible/scripts/manage_jenkins_node.py b/automation/ansible/scripts/manage_jenkins_node.py
index 50e25bc9aac5c10fb7ef087ed959d9e4e6faeeae..f1f7acc035878a4995c04151a8199ffaa9abe80d 100755 (executable)
--- a/automation/ansible/scripts/manage_jenkins_node.py
+++ b/automation/ansible/scripts/manage_jenkins_node.py
@@ -7,13 +7,13 @@ import json
 import logging
 import pathlib
 import pprint
-import requests
 import re
 import sys
 import time
 import xml.etree.ElementTree
 
 import jenkins
+import requests
 
 
 class OutputFormat(enum.Enum):

diff --git a/automation/kernel-seed.py b/automation/kernel-seed.py
index 394508cc4a817364685037fd9f93c55015d63166..5520396bffaba19ec7cfc87b303fbad9cfed4f68 100644 (file)
--- a/automation/kernel-seed.py
+++ b/automation/kernel-seed.py
@@ -19,12 +19,12 @@
 
 """ This script is used to generate a yaml list of kernel version tag """
 
+import argparse
 import os
 import re
-import yaml
-import argparse
-
 from distutils.version import Version
+
+import yaml
 from git import Repo
 
 

diff --git a/automation/update_standalone.py b/automation/update_standalone.py
index ab99af408858661419921c4730d2a456c5cbca67..9371c1e6b1d790f22471e3185b844f17121aa4b2 100644 (file)
--- a/automation/update_standalone.py
+++ b/automation/update_standalone.py
@@ -44,12 +44,13 @@ SNAPSHOTXML = (
 )
 
 import argparse
+import select
 import sys
-import libvirt
-from jenkinsapi.jenkins import Jenkins
 from time import sleep
+
+import libvirt
 import paramiko
-import select
+from jenkinsapi.jenkins import Jenkins
 
 
 def main():

diff --git a/lava/rootfs/vmdeboostrap/generate-root.py b/lava/rootfs/vmdeboostrap/generate-root.py
index 6aa65cb228c4e2eae7a27a13e21b0cf62809e861..5bcd4ee22508499b3c24b4586e2c4ef524082a65 100755 (executable)
--- a/lava/rootfs/vmdeboostrap/generate-root.py
+++ b/lava/rootfs/vmdeboostrap/generate-root.py
@@ -20,7 +20,6 @@ import os
 import shutil
 import subprocess
 import sys
-
 from datetime import datetime
 
 

diff --git a/poetry.lock b/poetry.lock
index fce10a3ab77385e32800824a8148e66d56f08d59..8c5795cefee8863a72347c4ec316d5596b203ed7 100644 (file)
--- a/poetry.lock
+++ b/poetry.lock
@@ -219,6 +219,20 @@ files = [
 [package.extras]
 all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"]
 
+[[package]]
+name = "isort"
+version = "5.13.2"
+description = "A Python utility / library to sort Python imports."
+optional = false
+python-versions = ">=3.8.0"
+files = [
+    {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"},
+    {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"},
+]
+
+[package.extras]
+colors = ["colorama (>=0.4.6)"]
+
 [[package]]
 name = "jenkins-job-builder"
 version = "6.4.2"
@@ -564,4 +578,4 @@ zstd = ["zstandard (>=0.18.0)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "4498a7b62020dadd3af79e5f3d729e79299e10c0077f53b3c1baf39c05316571"
+content-hash = "3f98c0b3cf08e147f75ba3f0e5a10dc85caf796814b27ecc97931899ab476f71"

diff --git a/pyproject.toml b/pyproject.toml
index 51a6159d0152d8581bb0b9df5bfa811fabb6b5be..d09110feed0d87f5fd11b33ddf5e709235f79e72 100644 (file)
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,9 +16,13 @@ jenkins-job-builder = "^6.4.2"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.10.0"
+isort = "^5.13.2"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
+
+[tool.isort]
+profile = "black"

diff --git a/scripts/babeltrace-benchmark/benchmark.py b/scripts/babeltrace-benchmark/benchmark.py
index 034b68c151fe04150a3c5d9e2912bca8f9d7201d..8d0948d657f33f53e9bdfc67769655b5084afac6 100644 (file)
--- a/scripts/babeltrace-benchmark/benchmark.py
+++ b/scripts/babeltrace-benchmark/benchmark.py
@@ -14,26 +14,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import argparse
 import json
 import os
-import tempfile
-from statistics import mean
-import argparse
 import sys
+import tempfile
 from operator import add
+from statistics import mean
 
+import git
+import lava_submit
 import matplotlib.pyplot as plt
+import numpy
 from matplotlib.backends.backend_pdf import PdfPages
 from matplotlib.ticker import PercentFormatter
-
-import git
-import numpy
-import lava_submit
-
 from minio import Minio
-from minio.error import NoSuchKey
-from minio.error import ResponseError
-
+from minio.error import NoSuchKey, ResponseError
 
 BENCHMARK_TYPES = ["dummy", "text"]
 DEFAULT_BUCKET = "lava"

diff --git a/scripts/babeltrace-benchmark/time.py b/scripts/babeltrace-benchmark/time.py
index cddc6fce72f2dd96f8b535925db47f1436bc704e..ddb15c0d83fe83188c75e758fee15a4587693483 100644 (file)
--- a/scripts/babeltrace-benchmark/time.py
+++ b/scripts/babeltrace-benchmark/time.py
@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import json
 import os
 import subprocess
 import tempfile
-import json
 from collections import defaultdict
 
 

diff --git a/scripts/jenkins_job_env.py b/scripts/jenkins_job_env.py
index 0607f38be4828928262fd13cd360771ae7ebb668..b132682757a1a7424fd60c91262aaf0314020c1d 100755 (executable)
--- a/scripts/jenkins_job_env.py
+++ b/scripts/jenkins_job_env.py
@@ -16,7 +16,6 @@ import sys
 import tempfile
 import urllib
 
-
 _ENV_VARS = [
     "BABELTRACE_PLUGIN_PATH",
     "CPPFLAGS",

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 737b3942bf5ce155536d1a7f6e93826c22837f98..4b658b1e3a24c0acc6f1fde4b15cd422a54737bc 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -24,6 +24,7 @@ import time
 import xmlrpc.client
 from urllib.parse import urljoin
 from urllib.request import urlretrieve
+
 import yaml
 from jinja2 import Environment, FileSystemLoader
 

diff --git a/scripts/system-tests/parse-results.py b/scripts/system-tests/parse-results.py
index 8efd1dff27c7add8535ad0a1ed1e46a5251b25b6..ef8e15c41fe988122e60fd66036ff03506a32c9d 100755 (executable)
--- a/scripts/system-tests/parse-results.py
+++ b/scripts/system-tests/parse-results.py
@@ -1,10 +1,11 @@
 #! /usr/bin/python3
-from subprocess import call
-from collections import defaultdict
 import csv
+import sys
+from collections import defaultdict
+from subprocess import call
+
 import numpy as np
 import pandas as pd
-import sys
 
 
 def test_case(df):