From 59243fd5e1f71262569ad64ef3d9b1d39a298f70 Mon Sep 17 00:00:00 2001 From: Willow Ahrens Date: Mon, 6 Jan 2025 16:16:27 -0500 Subject: [PATCH] ruff --- src/juliapkg/__init__.py | 18 +++++++++--------- src/juliapkg/deps.py | 5 +++-- src/juliapkg/find_julia.py | 6 +++--- src/juliapkg/state.py | 1 + test/test_all.py | 6 +++--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/juliapkg/__init__.py b/src/juliapkg/__init__.py index 12706e2..2ca3c3b 100644 --- a/src/juliapkg/__init__.py +++ b/src/juliapkg/__init__.py @@ -1,13 +1,13 @@ from .deps import ( - PkgSpec, - add, - executable, - offline, - project, - require_julia, - resolve, - rm, - status, + PkgSpec, + add, + executable, + offline, + project, + require_julia, + resolve, + rm, + status, ) __all__ = [ diff --git a/src/juliapkg/deps.py b/src/juliapkg/deps.py index 4e1179c..05827ed 100644 --- a/src/juliapkg/deps.py +++ b/src/juliapkg/deps.py @@ -8,7 +8,7 @@ from .compat import Compat, Version from .find_julia import find_julia, julia_version from .install_julia import log -from .state import STATE, thread_lock, process_lock +from .state import STATE, process_lock, thread_lock logger = logging.getLogger("juliapkg") @@ -314,7 +314,8 @@ def resolve(force=False, dry_run=False): log(f"Using Julia project at {project}") os.makedirs(project, exist_ok=True) if not STATE["offline"]: - # write a Project.toml specifying UUIDs and compatibility of required packages + # write a Project.toml specifying UUIDs and compatibility of required + # packages with open(os.path.join(project, "Project.toml"), "wt") as fp: print("[deps]", file=fp) for pkg in pkgs: diff --git a/src/juliapkg/find_julia.py b/src/juliapkg/find_julia.py index b631319..90e1332 100644 --- a/src/juliapkg/find_julia.py +++ b/src/juliapkg/find_julia.py @@ -5,7 +5,7 @@ from .compat import Compat, Version from .install_julia import best_julia_version, get_short_arch, install_julia, log -from .state import STATE, thread_lock, process_lock +from .state import STATE, process_lock, thread_lock def julia_version(exe): @@ -51,8 +51,8 @@ def find_julia(compat=None, prefix=None, install=False, upgrade=False): else: if compat is not None and ev_ver not in compat: log( - f"WARNING: juliapkg_exe={ev_exe} is Julia {ev_ver} but {compat} is" - " required." + f"WARNING: juliapkg_exe={ev_exe} is Julia {ev_ver} but {compat}" + "is required." ) return (ev_exe, ev_ver) # first look in the prefix diff --git a/src/juliapkg/state.py b/src/juliapkg/state.py index fe5b9f0..8021217 100644 --- a/src/juliapkg/state.py +++ b/src/juliapkg/state.py @@ -1,6 +1,7 @@ import os import sys from threading import RLock + from filelock import FileLock thread_lock = RLock() diff --git a/test/test_all.py b/test/test_all.py index eb2e917..d2acb9a 100644 --- a/test/test_all.py +++ b/test/test_all.py @@ -1,10 +1,10 @@ import json import os +import subprocess import tempfile +from multiprocessing import Pool import juliapkg -import subprocess -from multiprocessing import Pool def test_import(): @@ -25,7 +25,7 @@ def test_resolve(): def resolve_in_tempdir(tempdir): subprocess.run( - ["python", "-c", f"import juliapkg; juliapkg.resolve()"], + ["python", "-c", "import juliapkg; juliapkg.resolve()"], env=dict(os.environ, PYTHON_JULIAPKG_PROJECT=tempdir), )