Skip to content

Commit 8e97eda

Browse files
Enable isort rules (#279)
1 parent 5b7e470 commit 8e97eda

28 files changed

+114
-123
lines changed

pins/_types.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Union
21
from io import IOBase
2+
from typing import Union
33

44
StrOrFile = Union[str, IOBase]

pins/boards.py

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
import logging
2-
import tempfile
3-
import shutil
1+
import functools
42
import inspect
3+
import logging
54
import re
6-
import functools
7-
5+
import shutil
6+
import tempfile
7+
from datetime import datetime, timedelta
88
from io import IOBase
99
from pathlib import Path
10-
from importlib_resources import files
11-
from datetime import datetime, timedelta
10+
from typing import Mapping, Optional, Protocol, Sequence
1211

13-
from typing import Protocol, Sequence, Optional, Mapping
12+
from importlib_resources import files
1413

15-
from .versions import VersionRaw, guess_version, version_setup
16-
from .meta import Meta, MetaRaw, MetaFactory
17-
from .errors import PinsError, PinsVersionError
18-
from .drivers import load_data, save_data, load_file, default_title
19-
from .utils import inform, warn_deprecated, ExtendMethodDoc
20-
from .config import get_allow_rsc_short_name
2114
from .cache import PinsCache
22-
15+
from .config import get_allow_rsc_short_name
16+
from .drivers import default_title, load_data, load_file, save_data
17+
from .errors import PinsError, PinsVersionError
18+
from .meta import Meta, MetaFactory, MetaRaw
19+
from .utils import ExtendMethodDoc, inform, warn_deprecated
20+
from .versions import VersionRaw, guess_version, version_setup
2321

2422
_log = logging.getLogger(__name__)
2523

@@ -1164,9 +1162,10 @@ def prepare_pin_version(self, pin_dir_path, x, name: "str | None", *args, **kwar
11641162
# TODO: move out data_preview logic? Can we draw some limits here?
11651163
# note that the R library uses jsonlite::toJSON
11661164

1167-
import pandas as pd
11681165
import json
11691166

1167+
import pandas as pd
1168+
11701169
if isinstance(x, pd.DataFrame):
11711170
# TODO(compat) is 100 hard-coded?
11721171
# Note that we go df -> json -> dict, to take advantage of pandas type conversions

pins/cache.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import humanize
21
import logging
32
import os
4-
import time
53
import shutil
4+
import time
65
import urllib.parse
6+
from pathlib import Path
77

8-
from fsspec.implementations.cached import SimpleCacheFileSystem
8+
import humanize
99
from fsspec import register_implementation
10-
from pathlib import Path
10+
from fsspec.implementations.cached import SimpleCacheFileSystem
1111

1212
from .config import get_cache_dir
13-
from .utils import inform, hash_name
13+
from .utils import hash_name, inform
1414

1515
_log = logging.getLogger(__name__)
1616

pins/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import appdirs
21
import os
3-
42
from types import SimpleNamespace
53

4+
import appdirs
5+
66
PINS_NAME = "pins-py"
77
PINS_ENV_DATA_DIR = "PINS_DATA_DIR"
88
PINS_ENV_CACHE_DIR = "PINS_CACHE_DIR"

pins/constructors.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import fsspec
21
import os
32
import tempfile
43
import warnings
54

6-
from .boards import BaseBoard, BoardRsConnect, BoardManual, board_deparse
7-
from .cache import PinsCache, PinsRscCacheMapper, PinsAccessTimeCache, prefix_cache
8-
from .config import get_data_dir, get_cache_dir
5+
import fsspec
6+
7+
from .boards import BaseBoard, BoardManual, BoardRsConnect, board_deparse
8+
from .cache import PinsAccessTimeCache, PinsCache, PinsRscCacheMapper, prefix_cache
9+
from .config import get_cache_dir, get_data_dir
910

1011
# Kept here for backward-compatibility reasons.
1112
board_deparse # Note that this is not a constructor, but a function to represent them.

pins/drivers.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from pathlib import Path
2+
from typing import Sequence
23

3-
from .config import get_allow_pickle_read, PINS_ENV_INSECURE_READ
4-
from .meta import Meta
4+
from .config import PINS_ENV_INSECURE_READ, get_allow_pickle_read
55
from .errors import PinsInsecureReadError
6-
7-
from typing import Sequence
6+
from .meta import Meta
87

98
# TODO: move IFileSystem out of boards, to fix circular import
109
# from .boards import IFileSystem

pins/meta.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
from typing import ClassVar
2-
from dataclasses import dataclass, asdict, field, fields, InitVar
1+
from dataclasses import InitVar, asdict, dataclass, field, fields
32
from pathlib import Path
3+
from typing import ClassVar, List, Mapping, Optional, Sequence, Union
44

55
import yaml
66

7-
from typing import Mapping, Union, Sequence, Optional, List
8-
9-
from .versions import VersionRaw, Version, guess_version
10-
from ._types import StrOrFile, IOBase
7+
from ._types import IOBase, StrOrFile
8+
from .versions import Version, VersionRaw, guess_version
119

1210
META_FILENAME = "data.txt"
1311
DEFAULT_API_VERSION = 1

pins/rsconnect/api.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import logging
22
import os
3-
import requests
43
import tempfile
5-
4+
from collections.abc import Mapping
65
from dataclasses import dataclass
7-
from pathlib import Path
86
from functools import partial
97
from io import IOBase
8+
from pathlib import Path
9+
from typing import Generic, Sequence, TypeVar
1010
from urllib.parse import urlencode
1111

12-
from collections.abc import Mapping
13-
from typing import Sequence, TypeVar, Generic
14-
12+
import requests
1513

1614
RSC_API_KEY = "CONNECT_API_KEY"
1715
RSC_CODE_OBJECT_DOES_NOT_EXIST = 4

pins/rsconnect/fs.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
from dataclasses import dataclass, asdict, field, fields
1+
from dataclasses import asdict, dataclass, field, fields
22
from pathlib import Path
3+
from typing import Sequence
34

45
from fsspec import AbstractFileSystem
56

6-
from typing import Sequence
7-
7+
from ..utils import isfilelike
88
from .api import (
9-
RsConnectApi,
9+
RSC_CODE_OBJECT_DOES_NOT_EXIST,
1010
BaseEntity,
11-
User,
12-
Content,
1311
Bundle,
14-
RsConnectApiMissingContentError,
12+
Content,
13+
RsConnectApi,
1514
RsConnectApiError,
16-
RsConnectApiResultError,
15+
RsConnectApiMissingContentError,
1716
RsConnectApiRequestError,
18-
RSC_CODE_OBJECT_DOES_NOT_EXIST,
17+
RsConnectApiResultError,
18+
User,
1919
)
20-
from ..utils import isfilelike
2120

2221
# Misc ----
2322

pins/tests/conftest.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import pytest
2-
import tempfile
31
import os
2+
import tempfile
3+
from pathlib import Path
44

5+
import pytest
56
from importlib_resources import files
67
from pytest import mark as m
7-
from pathlib import Path
8+
89
from pins.tests.helpers import BoardBuilder, RscBoardBuilder, Snapshot, rm_env
910

1011
EXAMPLE_REL_PATH = "pins/tests/pins-compat"

pins/tests/helpers.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import pytest
2-
31
import contextlib
4-
import uuid
5-
import os
62
import json
3+
import os
74
import shutil
8-
9-
from tempfile import TemporaryDirectory
10-
from pathlib import Path
11-
from functools import wraps
5+
import uuid
126
from datetime import datetime
7+
from functools import wraps
8+
from pathlib import Path
9+
from tempfile import TemporaryDirectory
10+
11+
import pytest
12+
from fsspec import filesystem
1313
from importlib_resources import files
1414

1515
from pins.boards import BaseBoard, BoardRsConnect
16-
from fsspec import filesystem
1716

1817
DEFAULT_CREATION_DATE = datetime(2020, 1, 13, 23, 58, 59)
1918

pins/tests/test_boards.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import fsspec
21
import os
32
import uuid
4-
import pandas as pd
5-
import pytest
6-
7-
from pins.tests.helpers import DEFAULT_CREATION_DATE, rm_env
8-
from pins.config import PINS_ENV_INSECURE_READ
9-
from pins.errors import PinsError, PinsInsecureReadError, PinsVersionError
10-
from pins.meta import MetaRaw
11-
123
from datetime import datetime, timedelta
13-
from time import sleep
144
from pathlib import Path
5+
from time import sleep
6+
7+
import fsspec
8+
import pandas as pd
9+
import pytest
1510

1611
# using pytest cases, so that we can pass in fixtures as parameters
1712
# TODO: this seems like maybe overkill
1813
from pytest_cases import fixture, parametrize
1914

15+
from pins.config import PINS_ENV_INSECURE_READ
16+
from pins.errors import PinsError, PinsInsecureReadError, PinsVersionError
17+
from pins.meta import MetaRaw
18+
from pins.tests.helpers import DEFAULT_CREATION_DATE, rm_env
19+
2020

2121
@fixture
2222
def df():
@@ -39,7 +39,8 @@ def board_unversioned(backend):
3939

4040
@fixture
4141
def board_with_cache(backend):
42-
from pins.constructors import board as board_constructor, board_rsconnect
42+
from pins.constructors import board as board_constructor
43+
from pins.constructors import board_rsconnect
4344

4445
board = backend.create_tmp_board()
4546

pins/tests/test_cache.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import time
2+
from pathlib import Path
23

34
import pytest
5+
from fsspec import filesystem
6+
47
from pins.cache import (
58
CachePruner,
6-
touch_access_time,
7-
cache_prune,
89
PinsCache,
910
PinsUrlCache,
11+
cache_prune,
12+
touch_access_time,
1013
)
1114

12-
from fsspec import filesystem
13-
from pathlib import Path
14-
1515
# NOTE: windows time.time() implementation appears to have 16 millisecond precision, so
1616
# we need to add a small delay, in order to avoid prune checks appearing to happen at the
1717
# exact same moment something earlier was created / accessed.

pins/tests/test_compat.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import pytest
21
import datetime
32

3+
import pytest
44

55
from pins.errors import PinsError
6-
from pins.tests.helpers import xfail_fs
76
from pins.tests.conftest import PATH_TO_EXAMPLE_BOARD, PATH_TO_MANIFEST_BOARD
8-
7+
from pins.tests.helpers import xfail_fs
98

109
NOT_A_PIN = "not_a_pin_abcdefg"
1110
PIN_CSV = "df_csv"

pins/tests/test_compat_old_types.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import pandas as pd
2-
32
from importlib_resources import files
43

54
from pins import board_folder

pins/tests/test_config.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import os
2+
23
import pytest
34

4-
from pins.tests.helpers import rm_env
55
from pins import config
6+
from pins.tests.helpers import rm_env
67

78

89
@pytest.fixture

pins/tests/test_constructors.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import os
2+
from pathlib import Path
3+
24
import pandas as pd
35
import pytest
4-
56
from pandas.testing import assert_frame_equal
6-
from pathlib import Path
77

88
from pins import constructors as c
99
from pins.tests.conftest import (
10+
EXAMPLE_REL_PATH,
1011
PATH_TO_EXAMPLE_BOARD,
1112
PATH_TO_EXAMPLE_VERSION,
12-
EXAMPLE_REL_PATH,
1313
)
1414
from pins.tests.helpers import rm_env
1515

pins/tests/test_drivers.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
import fsspec
2-
import pytest
3-
import pandas as pd
4-
51
from pathlib import Path
62

7-
from pins.tests.helpers import rm_env
3+
import fsspec
4+
import pandas as pd
5+
import pytest
86

9-
from pins.meta import MetaRaw
107
from pins.config import PINS_ENV_INSECURE_READ
11-
from pins.drivers import load_data, save_data, default_title
8+
from pins.drivers import default_title, load_data, save_data
129
from pins.errors import PinsInsecureReadError
10+
from pins.meta import MetaRaw
11+
from pins.tests.helpers import rm_env
1312

1413

1514
@pytest.fixture

pins/tests/test_meta.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import pytest
21
import tempfile
3-
import yaml
4-
52
from datetime import datetime
63
from io import StringIO
74

5+
import pytest
6+
import yaml
7+
88
from pins.meta import Meta, MetaFactory
99
from pins.versions import Version
1010

0 commit comments

Comments
 (0)