Skip to content

Commit af3397b

Browse files
committed
Formats imports with isort
1 parent f818023 commit af3397b

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

fortls/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import sys
77
from multiprocessing import freeze_support
88

9-
from .helper_functions import resolve_globs, only_dirs
9+
from .helper_functions import only_dirs, resolve_globs
10+
from .interface import commandline_args
1011
from .jsonrpc import JSONRPC2Connection, ReadWriter, path_from_uri
1112
from .langserver import LangServer
1213
from .parse_fortran import fortran_file, process_file
13-
from .interface import commandline_args
14-
1514
from .version import __version__
1615

1716
__all__ = ["__version__"]

fortls/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import sys
21
import logging
2+
import sys
33

44
PY3K = sys.version_info >= (3, 0)
55

fortls/langserver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from typing import Pattern
1212

1313
# Local modules
14-
from fortls.version import __version__
1514
from fortls.constants import (
1615
CLASS_TYPE_ID,
1716
FORTRAN_LITERAL,
@@ -56,6 +55,7 @@
5655
SQ_STRING_REGEX,
5756
src_file_exts,
5857
)
58+
from fortls.version import __version__
5959

6060
# Global regexes
6161
# TODO: I think this can be replaced by fortls.regex_patterns type & class

fortls/objects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import copy
44
import os
55
import re
6-
from typing import Dict, NamedTuple, List, Set, Pattern
76
from dataclasses import dataclass
7+
from typing import Dict, List, NamedTuple, Pattern, Set
88

99
from fortls.constants import (
1010
ASSOC_TYPE_ID,

fortls/version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
try:
2-
from importlib.metadata import version, PackageNotFoundError
2+
from importlib.metadata import PackageNotFoundError, version
33
except ModuleNotFoundError:
4-
from importlib_metadata import version, PackageNotFoundError
4+
from importlib_metadata import PackageNotFoundError, version
55
try:
66
__version__ = version(__package__)
77
except PackageNotFoundError:

test/setup_tests.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
root_dir = Path(__file__).parent.parent.resolve()
1010
sys.path.insert(0, root_dir)
1111

12-
from fortls.jsonrpc import ( # noqa: E402, F401
13-
path_to_uri,
14-
read_rpc_messages,
15-
write_rpc_notification,
16-
write_rpc_request,
17-
)
12+
# Compromise since isort does not respect noqa
13+
from fortls.jsonrpc import path_to_uri # noqa: E402, F401
14+
from fortls.jsonrpc import read_rpc_messages # noqa: E402
15+
from fortls.jsonrpc import write_rpc_notification # noqa: E402, F401
16+
from fortls.jsonrpc import write_rpc_request # noqa: E402, F401
1817

1918
test_dir = root_dir / "test" / "test_source"
2019

test/test_preproc.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
from __future__ import annotations
22

3-
from setup_tests import (
4-
run_request,
5-
# path_to_uri,
6-
# write_rpc_notification,
7-
write_rpc_request,
8-
test_dir,
9-
)
3+
from setup_tests import run_request, test_dir, write_rpc_request
104

115

126
def test_hover():

0 commit comments

Comments
 (0)