Enable isort rules (#279)

nathanjmcdougall · web-flow · commit 8e97eda83f21 · 2024-07-25T00:48:19.000-05:00
diff --git a/pins/_types.py b/pins/_types.py
@@ -1,4 +1,4 @@
-from typing import Union
 from io import IOBase
+from typing import Union
 
 StrOrFile = Union[str, IOBase]
diff --git a/pins/boards.py b/pins/boards.py
@@ -1,25 +1,23 @@
-import logging
-import tempfile
-import shutil
+import functools
 import inspect
+import logging
 import re
-import functools
-
+import shutil
+import tempfile
+from datetime import datetime, timedelta
 from io import IOBase
 from pathlib import Path
-from importlib_resources import files
-from datetime import datetime, timedelta
+from typing import Mapping, Optional, Protocol, Sequence
 
-from typing import Protocol, Sequence, Optional, Mapping
+from importlib_resources import files
 
-from .versions import VersionRaw, guess_version, version_setup
-from .meta import Meta, MetaRaw, MetaFactory
-from .errors import PinsError, PinsVersionError
-from .drivers import load_data, save_data, load_file, default_title
-from .utils import inform, warn_deprecated, ExtendMethodDoc
-from .config import get_allow_rsc_short_name
 from .cache import PinsCache
-
+from .config import get_allow_rsc_short_name
+from .drivers import default_title, load_data, load_file, save_data
+from .errors import PinsError, PinsVersionError
+from .meta import Meta, MetaFactory, MetaRaw
+from .utils import ExtendMethodDoc, inform, warn_deprecated
+from .versions import VersionRaw, guess_version, version_setup
 
 _log = logging.getLogger(__name__)
 
@@ -1164,9 +1162,10 @@ def prepare_pin_version(self, pin_dir_path, x, name: "str | None", *args, **kwar
         # TODO: move out data_preview logic? Can we draw some limits here?
         #       note that the R library uses jsonlite::toJSON
 
-        import pandas as pd
         import json
 
+        import pandas as pd
+
         if isinstance(x, pd.DataFrame):
             # TODO(compat) is 100 hard-coded?
             # Note that we go df -> json -> dict, to take advantage of pandas type conversions
diff --git a/pins/cache.py b/pins/cache.py
@@ -1,16 +1,16 @@
-import humanize
 import logging
 import os
-import time
 import shutil
+import time
 import urllib.parse
+from pathlib import Path
 
-from fsspec.implementations.cached import SimpleCacheFileSystem
+import humanize
 from fsspec import register_implementation
-from pathlib import Path
+from fsspec.implementations.cached import SimpleCacheFileSystem
 
 from .config import get_cache_dir
-from .utils import inform, hash_name
+from .utils import hash_name, inform
 
 _log = logging.getLogger(__name__)
 
diff --git a/pins/config.py b/pins/config.py
@@ -1,8 +1,8 @@
-import appdirs
 import os
-
 from types import SimpleNamespace
 
+import appdirs
+
 PINS_NAME = "pins-py"
 PINS_ENV_DATA_DIR = "PINS_DATA_DIR"
 PINS_ENV_CACHE_DIR = "PINS_CACHE_DIR"
diff --git a/pins/constructors.py b/pins/constructors.py
@@ -1,11 +1,12 @@
-import fsspec
 import os
 import tempfile
 import warnings
 
-from .boards import BaseBoard, BoardRsConnect, BoardManual, board_deparse
-from .cache import PinsCache, PinsRscCacheMapper, PinsAccessTimeCache, prefix_cache
-from .config import get_data_dir, get_cache_dir
+import fsspec
+
+from .boards import BaseBoard, BoardManual, BoardRsConnect, board_deparse
+from .cache import PinsAccessTimeCache, PinsCache, PinsRscCacheMapper, prefix_cache
+from .config import get_cache_dir, get_data_dir
 
 # Kept here for backward-compatibility reasons.
 board_deparse  # Note that this is not a constructor, but a function to represent them.
diff --git a/pins/drivers.py b/pins/drivers.py
@@ -1,10 +1,9 @@
 from pathlib import Path
+from typing import Sequence
 
-from .config import get_allow_pickle_read, PINS_ENV_INSECURE_READ
-from .meta import Meta
+from .config import PINS_ENV_INSECURE_READ, get_allow_pickle_read
 from .errors import PinsInsecureReadError
-
-from typing import Sequence
+from .meta import Meta
 
 # TODO: move IFileSystem out of boards, to fix circular import
 # from .boards import IFileSystem
diff --git a/pins/meta.py b/pins/meta.py
@@ -1,13 +1,11 @@
-from typing import ClassVar
-from dataclasses import dataclass, asdict, field, fields, InitVar
+from dataclasses import InitVar, asdict, dataclass, field, fields
 from pathlib import Path
+from typing import ClassVar, List, Mapping, Optional, Sequence, Union
 
 import yaml
 
-from typing import Mapping, Union, Sequence, Optional, List
-
-from .versions import VersionRaw, Version, guess_version
-from ._types import StrOrFile, IOBase
+from ._types import IOBase, StrOrFile
+from .versions import Version, VersionRaw, guess_version
 
 META_FILENAME = "data.txt"
 DEFAULT_API_VERSION = 1
diff --git a/pins/rsconnect/api.py b/pins/rsconnect/api.py
@@ -1,17 +1,15 @@
 import logging
 import os
-import requests
 import tempfile
-
+from collections.abc import Mapping
 from dataclasses import dataclass
-from pathlib import Path
 from functools import partial
 from io import IOBase
+from pathlib import Path
+from typing import Generic, Sequence, TypeVar
 from urllib.parse import urlencode
 
-from collections.abc import Mapping
-from typing import Sequence, TypeVar, Generic
-
+import requests
 
 RSC_API_KEY = "CONNECT_API_KEY"
 RSC_CODE_OBJECT_DOES_NOT_EXIST = 4
diff --git a/pins/rsconnect/fs.py b/pins/rsconnect/fs.py
@@ -1,23 +1,22 @@
-from dataclasses import dataclass, asdict, field, fields
+from dataclasses import asdict, dataclass, field, fields
 from pathlib import Path
+from typing import Sequence
 
 from fsspec import AbstractFileSystem
 
-from typing import Sequence
-
+from ..utils import isfilelike
 from .api import (
-    RsConnectApi,
+    RSC_CODE_OBJECT_DOES_NOT_EXIST,
     BaseEntity,
-    User,
-    Content,
     Bundle,
-    RsConnectApiMissingContentError,
+    Content,
+    RsConnectApi,
     RsConnectApiError,
-    RsConnectApiResultError,
+    RsConnectApiMissingContentError,
     RsConnectApiRequestError,
-    RSC_CODE_OBJECT_DOES_NOT_EXIST,
+    RsConnectApiResultError,
+    User,
 )
-from ..utils import isfilelike
 
 # Misc ----
 
diff --git a/pins/tests/conftest.py b/pins/tests/conftest.py
@@ -1,10 +1,11 @@
-import pytest
-import tempfile
 import os
+import tempfile
+from pathlib import Path
 
+import pytest
 from importlib_resources import files
 from pytest import mark as m
-from pathlib import Path
+
 from pins.tests.helpers import BoardBuilder, RscBoardBuilder, Snapshot, rm_env
 
 EXAMPLE_REL_PATH = "pins/tests/pins-compat"
diff --git a/pins/tests/helpers.py b/pins/tests/helpers.py
@@ -1,19 +1,18 @@
-import pytest
-
 import contextlib
-import uuid
-import os
 import json
+import os
 import shutil
-
-from tempfile import TemporaryDirectory
-from pathlib import Path
-from functools import wraps
+import uuid
 from datetime import datetime
+from functools import wraps
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+import pytest
+from fsspec import filesystem
 from importlib_resources import files
 
 from pins.boards import BaseBoard, BoardRsConnect
-from fsspec import filesystem
 
 DEFAULT_CREATION_DATE = datetime(2020, 1, 13, 23, 58, 59)
 
diff --git a/pins/tests/test_boards.py b/pins/tests/test_boards.py
@@ -1,22 +1,22 @@
-import fsspec
 import os
 import uuid
-import pandas as pd
-import pytest
-
-from pins.tests.helpers import DEFAULT_CREATION_DATE, rm_env
-from pins.config import PINS_ENV_INSECURE_READ
-from pins.errors import PinsError, PinsInsecureReadError, PinsVersionError
-from pins.meta import MetaRaw
-
 from datetime import datetime, timedelta
-from time import sleep
 from pathlib import Path
+from time import sleep
+
+import fsspec
+import pandas as pd
+import pytest
 
 # using pytest cases, so that we can pass in fixtures as parameters
 # TODO: this seems like maybe overkill
 from pytest_cases import fixture, parametrize
 
+from pins.config import PINS_ENV_INSECURE_READ
+from pins.errors import PinsError, PinsInsecureReadError, PinsVersionError
+from pins.meta import MetaRaw
+from pins.tests.helpers import DEFAULT_CREATION_DATE, rm_env
+
 
 @fixture
 def df():
@@ -39,7 +39,8 @@ def board_unversioned(backend):
 
 @fixture
 def board_with_cache(backend):
-    from pins.constructors import board as board_constructor, board_rsconnect
+    from pins.constructors import board as board_constructor
+    from pins.constructors import board_rsconnect
 
     board = backend.create_tmp_board()
 
diff --git a/pins/tests/test_cache.py b/pins/tests/test_cache.py
@@ -1,17 +1,17 @@
 import time
+from pathlib import Path
 
 import pytest
+from fsspec import filesystem
+
 from pins.cache import (
     CachePruner,
-    touch_access_time,
-    cache_prune,
     PinsCache,
     PinsUrlCache,
+    cache_prune,
+    touch_access_time,
 )
 
-from fsspec import filesystem
-from pathlib import Path
-
 # NOTE: windows time.time() implementation appears to have 16 millisecond precision, so
 # we need to add a small delay, in order to avoid prune checks appearing to happen at the
 # exact same moment something earlier was created / accessed.
diff --git a/pins/tests/test_compat.py b/pins/tests/test_compat.py
@@ -1,11 +1,10 @@
-import pytest
 import datetime
 
+import pytest
 
 from pins.errors import PinsError
-from pins.tests.helpers import xfail_fs
 from pins.tests.conftest import PATH_TO_EXAMPLE_BOARD, PATH_TO_MANIFEST_BOARD
-
+from pins.tests.helpers import xfail_fs
 
 NOT_A_PIN = "not_a_pin_abcdefg"
 PIN_CSV = "df_csv"
diff --git a/pins/tests/test_compat_old_types.py b/pins/tests/test_compat_old_types.py
@@ -1,5 +1,4 @@
 import pandas as pd
-
 from importlib_resources import files
 
 from pins import board_folder
diff --git a/pins/tests/test_config.py b/pins/tests/test_config.py
@@ -1,8 +1,9 @@
 import os
+
 import pytest
 
-from pins.tests.helpers import rm_env
 from pins import config
+from pins.tests.helpers import rm_env
 
 
 @pytest.fixture
diff --git a/pins/tests/test_constructors.py b/pins/tests/test_constructors.py
@@ -1,15 +1,15 @@
 import os
+from pathlib import Path
+
 import pandas as pd
 import pytest
-
 from pandas.testing import assert_frame_equal
-from pathlib import Path
 
 from pins import constructors as c
 from pins.tests.conftest import (
+    EXAMPLE_REL_PATH,
     PATH_TO_EXAMPLE_BOARD,
     PATH_TO_EXAMPLE_VERSION,
-    EXAMPLE_REL_PATH,
 )
 from pins.tests.helpers import rm_env
 
diff --git a/pins/tests/test_drivers.py b/pins/tests/test_drivers.py
@@ -1,15 +1,14 @@
-import fsspec
-import pytest
-import pandas as pd
-
 from pathlib import Path
 
-from pins.tests.helpers import rm_env
+import fsspec
+import pandas as pd
+import pytest
 
-from pins.meta import MetaRaw
 from pins.config import PINS_ENV_INSECURE_READ
-from pins.drivers import load_data, save_data, default_title
+from pins.drivers import default_title, load_data, save_data
 from pins.errors import PinsInsecureReadError
+from pins.meta import MetaRaw
+from pins.tests.helpers import rm_env
 
 
 @pytest.fixture
diff --git a/pins/tests/test_meta.py b/pins/tests/test_meta.py
@@ -1,10 +1,10 @@
-import pytest
 import tempfile
-import yaml
-
 from datetime import datetime
 from io import StringIO
 
+import pytest
+import yaml
+
 from pins.meta import Meta, MetaFactory
 from pins.versions import Version
 
diff --git a/pins/tests/test_rsconnect_api.py b/pins/tests/test_rsconnect_api.py
diff --git a/pins/tests/test_utils.py b/pins/tests/test_utils.py
diff --git a/pins/tests/test_versions.py b/pins/tests/test_versions.py
diff --git a/pins/utils.py b/pins/utils.py
diff --git a/pins/versions.py b/pins/versions.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/script/ci-compat-check/dump_py_pins.py b/script/ci-compat-check/dump_py_pins.py
diff --git a/script/ci-compat-check/validate_r_to_py.py b/script/ci-compat-check/validate_r_to_py.py
diff --git a/script/stage_example_bundle.py b/script/stage_example_bundle.py
