Add and run isort on Python files (#1520)

* add and run isort

* udpate more import statements

* fix typo

tests/conftest.py

@@ -4,9 +4,8 @@
 from pytest import mark
 from pytest import skip
 
-from jrnl.os_compat import on_windows
 from jrnl.os_compat import on_posix
-
+from jrnl.os_compat import on_windows
 
 pytest_plugins = [
     "tests.lib.fixtures",

tests/lib/fixtures.py

@@ -1,23 +1,23 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-from collections import defaultdict
 import os
-from pathlib import Path
 import tempfile
-
+from collections import defaultdict
 from collections.abc import Iterable
+from pathlib import Path
+from unittest.mock import Mock
+from unittest.mock import patch
+
+import toml
 from keyring import backend
 from keyring import errors
 from pytest import fixture
-from unittest.mock import patch
-from unittest.mock import Mock
-from .helpers import get_fixture
-import toml
 from rich.console import Console
 
 from jrnl.config import load_config
 from jrnl.os_compat import split_args
+from tests.lib.helpers import get_fixture
 
 
 # --- Keyring --- #

tests/lib/given_steps.py

@@ -1,12 +1,12 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-from datetime import datetime
 import json
 import os
 import random
 import shutil
 import string
+from datetime import datetime
 from unittest.mock import MagicMock
 from unittest.mock import patch
 from xml.etree import ElementTree
@@ -16,10 +16,9 @@ from pytest_bdd.parsers import parse
 
 from jrnl import __version__
 from jrnl.time import __get_pdt_calendar
-
-from .fixtures import FailedKeyring
-from .fixtures import TestKeyring
-from .helpers import get_fixture
+from tests.lib.fixtures import FailedKeyring
+from tests.lib.fixtures import TestKeyring
+from tests.lib.helpers import get_fixture
 
 
 @given(parse("we {editor_method} to the editor if opened\n{editor_input}"))

tests/lib/then_steps.py

@@ -11,11 +11,10 @@ from pytest_bdd.parsers import parse
 from ruamel.yaml import YAML
 
 from jrnl.config import scope_config
-
-from .helpers import assert_equal_tags_ignoring_order
-from .helpers import does_directory_contain_files
-from .helpers import parse_should_or_should_not
-from .helpers import get_nested_val
+from tests.lib.helpers import assert_equal_tags_ignoring_order
+from tests.lib.helpers import does_directory_contain_files
+from tests.lib.helpers import get_nested_val
+from tests.lib.helpers import parse_should_or_should_not
 
 
 @then("we should get no error")

tests/lib/when_steps.py

@@ -1,8 +1,8 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-from contextlib import ExitStack
 import os
+from contextlib import ExitStack
 
 from pytest_bdd import when
 from pytest_bdd.parsers import parse

tests/unit/test_color.py

@@ -1,9 +1,9 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
+import pytest
 from colorama import Fore
 from colorama import Style
-import pytest
 
 from jrnl.color import colorize
 

tests/unit/test_config_file.py

@@ -1,11 +1,12 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-import pytest
 import os
 
-from jrnl.install import find_alt_config
+import pytest
+
 from jrnl.exception import JrnlException
+from jrnl.install import find_alt_config
 
 
 def test_find_alt_config(request):

tests/unit/test_jrnl.py

@@ -1,15 +1,15 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
+import random
+import string
 from unittest import mock
 
 import pytest
 
-import random
-import string
 import jrnl
-from jrnl.jrnl import _display_search_results
 from jrnl.args import parse_args
+from jrnl.jrnl import _display_search_results
 
 
 @pytest.fixture

tests/unit/test_override.py

@@ -1,6 +1,8 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
+from argparse import Namespace
+
 import pytest
 
 from jrnl.override import _convert_dots_to_list
@@ -9,8 +11,6 @@ from jrnl.override import _get_key_and_value_from_pair
 from jrnl.override import _recursively_apply
 from jrnl.override import apply_overrides
 
-from argparse import Namespace
-
 
 @pytest.fixture()
 def minimal_config():

tests/unit/test_path.py

@@ -1,16 +1,16 @@
 # Copyright (C) 2012-2022 jrnl contributors
 # License: https://www.gnu.org/licenses/gpl-3.0.html
 
-import pytest
 import random
 import string
-
 from os import getenv
 from unittest.mock import patch
 
-from jrnl.path import home_dir
-from jrnl.path import expand_path
+import pytest
+
 from jrnl.path import absolute_path
+from jrnl.path import expand_path
+from jrnl.path import home_dir
 
 
 @pytest.fixture