diff --git a/examples/hello-python/app/web.py b/examples/hello-python/app/web.py
index 3008e692..6173ab71 100644
--- a/examples/hello-python/app/web.py
+++ b/examples/hello-python/app/web.py
@@ -1,7 +1,7 @@
 # pylint: disable=import-error
 # pylint: disable=unused-import
-import os
 import asyncio  # noqa: F401
+import os
 
 import aioredis
 from aiohttp import web
diff --git a/podman_compose.py b/podman_compose.py
index e41008a8..9556ad3d 100755
--- a/podman_compose.py
+++ b/podman_compose.py
@@ -7,21 +7,20 @@
 # https://docs.docker.com/compose/django/
 # https://docs.docker.com/compose/wordpress/
 # TODO: podman pod logs --color -n -f pod_testlogs
-import sys
-import os
-import getpass
 import argparse
-import itertools
-import subprocess
-import re
+import asyncio.subprocess
+import getpass
+import glob
 import hashlib
-import random
+import itertools
 import json
-import glob
-import asyncio.subprocess
-import signal
-
+import os
+import random
+import re
 import shlex
+import signal
+import subprocess
+import sys
 from asyncio import Task
 
 try:
diff --git a/pytests/test_can_merge_build.py b/pytests/test_can_merge_build.py
index 86a019bb..2519da76 100644
--- a/pytests/test_can_merge_build.py
+++ b/pytests/test_can_merge_build.py
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0
 
-import copy
-import os
 import argparse
-import yaml
+import os
 import unittest
+
+import yaml
 from parameterized import parameterized
-from podman_compose import normalize_service, PodmanCompose
+
+from podman_compose import PodmanCompose
+from podman_compose import normalize_service
 
 
 class TestMergeBuild(unittest.TestCase):
diff --git a/pytests/test_can_merge_cmd_ent.py b/pytests/test_can_merge_cmd_ent.py
index 2a3295de..973a6911 100644
--- a/pytests/test_can_merge_cmd_ent.py
+++ b/pytests/test_can_merge_cmd_ent.py
@@ -1,12 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0
 
+import argparse
 import copy
 import os
-import argparse
-import yaml
 import unittest
+
+import yaml
 from parameterized import parameterized
-from podman_compose import normalize_service, PodmanCompose
+
+from podman_compose import PodmanCompose
+from podman_compose import normalize_service
 
 test_keys = ["command", "entrypoint"]
 
diff --git a/pytests/test_normalize_final_build.py b/pytests/test_normalize_final_build.py
index 6915bbe3..98d3ad7c 100644
--- a/pytests/test_normalize_final_build.py
+++ b/pytests/test_normalize_final_build.py
@@ -2,16 +2,15 @@
 # pylint: disable=protected-access
 
 import argparse
-import copy
 import os
-import yaml
 import unittest
+
+import yaml
 from parameterized import parameterized
-from podman_compose import (
-    normalize_final,
-    normalize_service_final,
-    PodmanCompose,
-)
+
+from podman_compose import PodmanCompose
+from podman_compose import normalize_final
+from podman_compose import normalize_service_final
 
 cwd = os.path.abspath(".")
 
diff --git a/setup.py b/setup.py
index 56082e0d..8f7a4e9b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
 import os
+
 from setuptools import setup
 
 try:
diff --git a/tests/test_podman_compose.py b/tests/test_podman_compose.py
index 999e2aaa..1128730f 100644
--- a/tests/test_podman_compose.py
+++ b/tests/test_podman_compose.py
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
 
-from pathlib import Path
 import os
 import unittest
+from pathlib import Path
+
 from .test_utils import RunSubprocessMixin
 
 
diff --git a/tests/test_podman_compose_config.py b/tests/test_podman_compose_config.py
index ef383b23..1b860ff2 100644
--- a/tests/test_podman_compose_config.py
+++ b/tests/test_podman_compose_config.py
@@ -8,11 +8,13 @@
 
 # pylint: disable=redefined-outer-name
 import os
+import unittest
+
+from parameterized import parameterized
+
 from .test_podman_compose import podman_compose_path
 from .test_podman_compose import test_path
 from .test_utils import RunSubprocessMixin
-import unittest
-from parameterized import parameterized
 
 
 def profile_compose_file():
diff --git a/tests/test_podman_compose_include.py b/tests/test_podman_compose_include.py
index 5ca3964b..5b5044cd 100644
--- a/tests/test_podman_compose_include.py
+++ b/tests/test_podman_compose_include.py
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
-from pathlib import Path
-import subprocess
 import unittest
+from pathlib import Path
 
 from .test_utils import RunSubprocessMixin
 
diff --git a/tests/test_podman_compose_tests.py b/tests/test_podman_compose_tests.py
index 2f4b4d98..e4383b5c 100644
--- a/tests/test_podman_compose_tests.py
+++ b/tests/test_podman_compose_tests.py
@@ -8,7 +8,6 @@
 
 # pylint: disable=redefined-outer-name
 import os
-import time
 import unittest
 
 from .test_podman_compose import podman_compose_path
diff --git a/tests/test_podman_compose_up_down.py b/tests/test_podman_compose_up_down.py
index f7c3880e..6db820dd 100644
--- a/tests/test_podman_compose_up_down.py
+++ b/tests/test_podman_compose_up_down.py
@@ -8,11 +8,13 @@
 
 # pylint: disable=redefined-outer-name
 import os
+import unittest
+
+from parameterized import parameterized
+
 from .test_podman_compose import podman_compose_path
 from .test_podman_compose import test_path
 from .test_utils import RunSubprocessMixin
-from parameterized import parameterized
-import unittest
 
 
 def profile_compose_file():