From 7b409747793fc9cd3a72c0088d9b18cf73b3d602 Mon Sep 17 00:00:00 2001 From: gryf Date: Sat, 14 Sep 2024 09:22:41 +0200 Subject: [PATCH] Fixed imports order --- fs_uae_wrapper/archive.py | 3 +-- fs_uae_wrapper/base.py | 3 +-- fs_uae_wrapper/file_archive.py | 6 +++--- fs_uae_wrapper/plain.py | 3 +-- fs_uae_wrapper/utils.py | 3 +-- fs_uae_wrapper/whdload.py | 3 +-- fs_uae_wrapper/wrapper.py | 3 +-- pyproject.toml | 8 ++++++++ tests/test_archive.py | 6 ++---- tests/test_base.py | 10 ++++------ tests/test_cd32.py | 6 ++---- tests/test_file_archive.py | 3 +-- tests/test_message.py | 3 +-- tests/test_plain.py | 6 ++---- tests/test_savestate.py | 6 ++---- tests/test_utils.py | 7 +++---- tests/test_whdload.py | 6 ++---- tests/test_wrapper.py | 7 +++---- 18 files changed, 39 insertions(+), 53 deletions(-) diff --git a/fs_uae_wrapper/archive.py b/fs_uae_wrapper/archive.py index 5aedca3..6d47297 100644 --- a/fs_uae_wrapper/archive.py +++ b/fs_uae_wrapper/archive.py @@ -7,8 +7,7 @@ the temporary one. import os import shutil -from fs_uae_wrapper import base -from fs_uae_wrapper import utils +from fs_uae_wrapper import base, utils class Wrapper(base.ArchiveBase): diff --git a/fs_uae_wrapper/base.py b/fs_uae_wrapper/base.py index 3e4efbf..2a08a7f 100644 --- a/fs_uae_wrapper/base.py +++ b/fs_uae_wrapper/base.py @@ -6,8 +6,7 @@ import os import shutil import tempfile -from fs_uae_wrapper import utils -from fs_uae_wrapper import path +from fs_uae_wrapper import path, utils class Base(object): diff --git a/fs_uae_wrapper/file_archive.py b/fs_uae_wrapper/file_archive.py index ec0375e..21ef680 100644 --- a/fs_uae_wrapper/file_archive.py +++ b/fs_uae_wrapper/file_archive.py @@ -1,10 +1,10 @@ """ File archive classes """ -import os -import subprocess -import re import logging +import os +import re +import subprocess from fs_uae_wrapper import path diff --git a/fs_uae_wrapper/plain.py b/fs_uae_wrapper/plain.py index c590451..2310534 100644 --- a/fs_uae_wrapper/plain.py +++ b/fs_uae_wrapper/plain.py @@ -2,8 +2,7 @@ Simple class for executing fs-uae with specified parameters. This is a failsafe class for running fs-uae. """ -from fs_uae_wrapper import base -from fs_uae_wrapper import utils +from fs_uae_wrapper import base, utils class Wrapper(base.Base): diff --git a/fs_uae_wrapper/utils.py b/fs_uae_wrapper/utils.py index 3e67eed..bbf4b03 100644 --- a/fs_uae_wrapper/utils.py +++ b/fs_uae_wrapper/utils.py @@ -8,8 +8,7 @@ import pathlib import shutil import subprocess -from fs_uae_wrapper import message -from fs_uae_wrapper import file_archive +from fs_uae_wrapper import file_archive, message class CmdOption(dict): diff --git a/fs_uae_wrapper/whdload.py b/fs_uae_wrapper/whdload.py index 1883c78..8ebf3b6 100644 --- a/fs_uae_wrapper/whdload.py +++ b/fs_uae_wrapper/whdload.py @@ -6,8 +6,7 @@ It will use compressed base image and compressed directories. import logging import os -from fs_uae_wrapper import base -from fs_uae_wrapper import utils +from fs_uae_wrapper import base, utils class Wrapper(base.ArchiveBase): diff --git a/fs_uae_wrapper/wrapper.py b/fs_uae_wrapper/wrapper.py index 8a4be91..5512057 100644 --- a/fs_uae_wrapper/wrapper.py +++ b/fs_uae_wrapper/wrapper.py @@ -7,8 +7,7 @@ import logging import os import sys -from fs_uae_wrapper import utils -from fs_uae_wrapper import WRAPPER_KEY +from fs_uae_wrapper import WRAPPER_KEY, utils def setup_logger(options): diff --git a/pyproject.toml b/pyproject.toml index e295174..cd0662c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,3 +38,11 @@ py-modules = ["fs_uae_wrapper"] [tool.distutils.bdist_wheel] universal = true + +[tool.ruff.lint] +select = [ + "F", # pyflakes + "E", # pycodestyle + "I", # isort + "RUF", # ruff-specific rules +] diff --git a/tests/test_archive.py b/tests/test_archive.py index 40f9d46..08b503a 100644 --- a/tests/test_archive.py +++ b/tests/test_archive.py @@ -1,11 +1,9 @@ import os import shutil from tempfile import mkdtemp -from unittest import TestCase -from unittest import mock +from unittest import TestCase, mock -from fs_uae_wrapper import archive -from fs_uae_wrapper import utils +from fs_uae_wrapper import archive, utils class TestArchive(TestCase): diff --git a/tests/test_base.py b/tests/test_base.py index a12220a..5e59a4b 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -1,12 +1,10 @@ import os -import sys import shutil -from tempfile import mkstemp, mkdtemp -from unittest import TestCase -from unittest import mock +import sys +from tempfile import mkdtemp, mkstemp +from unittest import TestCase, mock -from fs_uae_wrapper import base -from fs_uae_wrapper import utils +from fs_uae_wrapper import base, utils class TestBase(TestCase): diff --git a/tests/test_cd32.py b/tests/test_cd32.py index 87dc3c4..6774e62 100644 --- a/tests/test_cd32.py +++ b/tests/test_cd32.py @@ -1,8 +1,6 @@ -from unittest import TestCase -from unittest import mock +from unittest import TestCase, mock -from fs_uae_wrapper import cd32 -from fs_uae_wrapper import utils +from fs_uae_wrapper import cd32, utils class TestCD32(TestCase): diff --git a/tests/test_file_archive.py b/tests/test_file_archive.py index 29c131f..1dcfa89 100644 --- a/tests/test_file_archive.py +++ b/tests/test_file_archive.py @@ -1,8 +1,7 @@ import os import shutil from tempfile import mkdtemp -from unittest import TestCase -from unittest import mock +from unittest import TestCase, mock from fs_uae_wrapper import file_archive diff --git a/tests/test_message.py b/tests/test_message.py index 816ce4d..2cf2b5e 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -1,6 +1,5 @@ -from unittest import TestCase import os -from unittest import mock +from unittest import TestCase, mock from fs_uae_wrapper import message diff --git a/tests/test_plain.py b/tests/test_plain.py index fb1223e..fd9e9bd 100644 --- a/tests/test_plain.py +++ b/tests/test_plain.py @@ -1,8 +1,6 @@ -from unittest import TestCase -from unittest import mock +from unittest import TestCase, mock -from fs_uae_wrapper import plain -from fs_uae_wrapper import utils +from fs_uae_wrapper import plain, utils class TestPlainModule(TestCase): diff --git a/tests/test_savestate.py b/tests/test_savestate.py index 2b456e4..ebf79db 100644 --- a/tests/test_savestate.py +++ b/tests/test_savestate.py @@ -1,11 +1,9 @@ import os import shutil from tempfile import mkdtemp -from unittest import TestCase -from unittest import mock +from unittest import TestCase, mock -from fs_uae_wrapper import savestate -from fs_uae_wrapper import utils +from fs_uae_wrapper import savestate, utils class TestSaveState(TestCase): diff --git a/tests/test_utils.py b/tests/test_utils.py index ae1f3d4..fa96bea 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,9 +1,8 @@ import os -import sys -from tempfile import mkstemp, mkdtemp -from unittest import TestCase import shutil -from unittest import mock +import sys +from tempfile import mkdtemp, mkstemp +from unittest import TestCase, mock from fs_uae_wrapper import utils diff --git a/tests/test_whdload.py b/tests/test_whdload.py index 58d4185..7afa437 100644 --- a/tests/test_whdload.py +++ b/tests/test_whdload.py @@ -1,11 +1,9 @@ import os import shutil from tempfile import mkdtemp -from unittest import TestCase -from unittest import mock +from unittest import TestCase, mock -from fs_uae_wrapper import whdload -from fs_uae_wrapper import utils +from fs_uae_wrapper import utils, whdload class TestWHDLoad(TestCase): diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index 429eb5e..f246971 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -1,9 +1,8 @@ import os -import sys -from tempfile import mkstemp, mkdtemp -from unittest import TestCase import shutil -from unittest import mock +import sys +from tempfile import mkdtemp, mkstemp +from unittest import TestCase, mock from fs_uae_wrapper import wrapper