Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 15, 2024
1 parent e792ad6 commit 4ad9f79
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 2 additions & 0 deletions brainglobe_utils/general/list.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from natsort import natsorted


def remove_empty_string(str_list):
"""
Removes any empty strings from a list of strings
Expand All @@ -13,6 +14,7 @@ def unique_elements_lists(list_in):
"""return the unique elements in a list"""
return list(dict.fromkeys(list_in))


def check_unique_list(in_list, natural_sort=True):
"""
Checks if all the items in a list are unique or not
Expand Down
3 changes: 2 additions & 1 deletion brainglobe_utils/general/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from slurmio import slurmio
from tqdm import tqdm

from brainglobe_utils.general.string import get_text_lines
from brainglobe_utils.general.exceptions import CommandLineInputError
from brainglobe_utils.general.string import get_text_lines

# On Windows, max_workers must be less than or equal to 61
# https://docs.python.org/3/library/concurrent.futures.html#processpoolexecutor
Expand Down Expand Up @@ -351,6 +351,7 @@ def delete_directory_contents(directory, progress=False):
for f in files:
os.remove(os.path.join(directory, f))


def check_path_exists(file):
"""
Returns True is a file exists, otherwise throws a FileNotFoundError
Expand Down
6 changes: 4 additions & 2 deletions tests/tests/test_general/test_list.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from brainglobe_utils.general import list as list_tools

a = [1, "a", 10, 30]
b = [30, 10, "c", "d"]

Expand All @@ -7,7 +8,6 @@
list_without_empty = ["test1", "test 2", " ", "test4"]



def test_remove_empty_string():
assert (
list_tools.remove_empty_string(list_with_empty) == list_without_empty
Expand All @@ -19,11 +19,13 @@ def test_unique_elements_list():
unique_list = [1, 2, "a", "b", "dog"]
assert list_tools.unique_elements_lists(list_in) == unique_list


def test_check_unique_list():
a = [1, "a", 10, 30]
assert (True, []) == list_tools.check_unique_list(a)
repeating_list = [1, 2, 3, 3, "dog", "cat", "dog"]
assert (False, [3, "dog"]) == list_tools.check_unique_list(repeating_list)


def test_common_member():
assert (True, [10, 30]) == list_tools.common_member(a, b)
assert (True, [10, 30]) == list_tools.common_member(a, b)
4 changes: 3 additions & 1 deletion tests/tests/test_general/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import pytest

from brainglobe_utils.general import system
from brainglobe_utils.general.string import get_text_lines
from brainglobe_utils.general.exceptions import CommandLineInputError
from brainglobe_utils.general.string import get_text_lines

data_dir = Path("tests", "data")
cubes_dir = data_dir / "cubes"
Expand Down Expand Up @@ -328,10 +328,12 @@ def test_delete_directory_contents(tmp_path):
system.delete_directory_contents(delete_dir, progress=False)
assert os.listdir(delete_dir) == []


def write_file_single_size(directory, file_size):
with open(os.path.join(directory, str(file_size)), "wb") as fout:
fout.write(os.urandom(file_size))


def test_check_path_exists(tmpdir):
num = 10
tmpdir = str(tmpdir)
Expand Down

0 comments on commit 4ad9f79

Please sign in to comment.