From 6ace6bbf2d26f3e926c07fb2837aafcc0a272e67 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 4 Jul 2024 18:19:55 +0200 Subject: [PATCH 1/2] Add import sorting to ruff --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4956513..fb91a84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: ruff name: ruff lint - args: ["--fix"] + args: ["--select", "I", "--fix"] files: ^pysqa/ - id: ruff-format name: ruff format From a661a4d6f7aeacf5cc5f642e3174534002900207 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:20:15 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pysqa/_version.py | 2 +- pysqa/executor/__main__.py | 2 +- pysqa/executor/backend.py | 7 ++++--- pysqa/executor/executor.py | 8 +++++--- pysqa/executor/helper.py | 4 ++-- pysqa/ext/modular.py | 1 + pysqa/queueadapter.py | 3 ++- pysqa/utils/basic.py | 2 +- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pysqa/_version.py b/pysqa/_version.py index f5233dc..3632ccc 100644 --- a/pysqa/_version.py +++ b/pysqa/_version.py @@ -11,12 +11,12 @@ """Git implementation of _version.py.""" import errno +import functools import os import re import subprocess import sys from typing import Any, Callable, Dict, List, Optional, Tuple -import functools def get_keywords() -> Dict[str, str]: diff --git a/pysqa/executor/__main__.py b/pysqa/executor/__main__.py index 3ce0c98..a522c93 100644 --- a/pysqa/executor/__main__.py +++ b/pysqa/executor/__main__.py @@ -1,6 +1,6 @@ import sys -from pysqa.executor.backend import command_line +from pysqa.executor.backend import command_line if __name__ == "__main__": command_line(arguments_lst=sys.argv[1:]) diff --git a/pysqa/executor/backend.py b/pysqa/executor/backend.py index 7bdf6f7..192c68a 100644 --- a/pysqa/executor/backend.py +++ b/pysqa/executor/backend.py @@ -1,13 +1,14 @@ import os -from typing import Optional import sys +from typing import Optional from pympipool import Executor + from pysqa.executor.helper import ( - read_from_file, deserialize, - write_to_file, + read_from_file, serialize_result, + write_to_file, ) diff --git a/pysqa/executor/executor.py b/pysqa/executor/executor.py index e107c30..514e774 100644 --- a/pysqa/executor/executor.py +++ b/pysqa/executor/executor.py @@ -1,12 +1,14 @@ import os import queue +from concurrent.futures import Executor as FutureExecutor +from concurrent.futures import Future from typing import Optional -from concurrent.futures import Future, Executor as FutureExecutor -from pympipool.shared import cancel_items_in_queue, RaisingThread +from pympipool.shared import RaisingThread, cancel_items_in_queue + from pysqa.executor.helper import ( - reload_previous_futures, find_executed_tasks, + reload_previous_futures, serialize_funct, write_to_file, ) diff --git a/pysqa/executor/helper.py b/pysqa/executor/helper.py index dfbc64e..9828089 100644 --- a/pysqa/executor/helper.py +++ b/pysqa/executor/helper.py @@ -1,9 +1,9 @@ +import hashlib import os -import re import queue +import re from concurrent.futures import Future -import hashlib import cloudpickle diff --git a/pysqa/ext/modular.py b/pysqa/ext/modular.py index 158797b..b2cf01a 100644 --- a/pysqa/ext/modular.py +++ b/pysqa/ext/modular.py @@ -1,6 +1,7 @@ # coding: utf-8 # Copyright (c) Jan Janssen from typing import Optional + import pandas from pysqa.utils.basic import BasisQueueAdapter diff --git a/pysqa/queueadapter.py b/pysqa/queueadapter.py index 971e2e6..e8e2c74 100644 --- a/pysqa/queueadapter.py +++ b/pysqa/queueadapter.py @@ -2,9 +2,10 @@ # Copyright (c) Jan Janssen import os -import pandas from typing import Optional +import pandas + from pysqa.ext.modular import ModularQueueAdapter from pysqa.utils.basic import BasisQueueAdapter from pysqa.utils.config import read_config diff --git a/pysqa/utils/basic.py b/pysqa/utils/basic.py index 04a5874..6da25ee 100644 --- a/pysqa/utils/basic.py +++ b/pysqa/utils/basic.py @@ -5,7 +5,7 @@ import importlib import os import re -from typing import Optional, List +from typing import List, Optional import pandas from jinja2 import Template