Ruff import sorting (#518)

* enable ruff import sorting

* ruff-update import order

* change(pre-commit): ruff --fix before black

* update CHANGELOG.md

.pre-commit-config.yaml

@@ -2,6 +2,11 @@
 # Please run `pre-commit run --all-files` when adding or changing entries.
 
 repos:
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: 'v0.0.257'
+    hooks:
+    - id: ruff
+      args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/psf/black
     rev: 22.12.0
     hooks:
@@ -19,10 +24,6 @@ repos:
         args: [--ignore=D004]
         additional_dependencies:
           - importlib_metadata < 5; python_version == "3.7"
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.257'
-    hooks:
-    - id: ruff
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.991
     hooks:

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Move to `FutureWarning` from `DeprecationWarning` for item search interface functions that are to be removed [#464](https://github.com/stac-utils/pystac-client/pull/464)
 - Consolidate contributing docs into one place [#478](https://github.com/stac-utils/pystac-client/issues/478)
 - Use `pyproject.toml` instead of `setup.py` [#501](https://github.com/stac-utils/pystac-client/pull/501)
+- Enable Ruff import sorting [#518](https://github.com/stac-utils/pystac-client/pull/518)
 
 ### Fixed
 

pyproject.toml

@@ -100,7 +100,7 @@ max-line-length = 130
 [tool.ruff]
 ignore = ["E722", "E731"]
 line-length = 88
-select = ["E", "F", "W"]
+select = ["E", "F", "W", "I"]
 
 [tool.ruff.per-file-ignores]
 "__init__.py" = ["F401"]

pystac_client/cli.py

@@ -4,19 +4,19 @@
 import os
 import re
 import sys
-from typing import Any, Dict, List, Optional
 import warnings
+from typing import Any, Dict, List, Optional
 
 from .client import Client
 from .conformance import ConformanceClasses
 from .item_search import OPS
 from .version import __version__
 from .warnings import (
-    PystacClientWarning,
-    NoConformsTo,
     DoesNotConformTo,
-    MissingLink,
     FallbackToPystac,
+    MissingLink,
+    NoConformsTo,
+    PystacClientWarning,
 )
 
 logger = logging.getLogger(__name__)

pystac_client/collection_client.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -11,7 +12,6 @@
     Union,
     cast,
 )
-import warnings
 
 import pystac
 
@@ -25,6 +25,7 @@
 
 if TYPE_CHECKING:
     from pystac.item import Item as Item_Type
+
     from pystac_client import Client
 
 

pystac_client/stac_api_io.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import warnings
 from copy import deepcopy
 from typing import (
     TYPE_CHECKING,
@@ -12,9 +13,7 @@
     Tuple,
     Union,
 )
-from typing_extensions import TypeAlias
 from urllib.parse import urlparse
-import warnings
 
 import pystac
 from pystac.link import Link
@@ -26,6 +25,7 @@
 )
 from pystac.stac_io import DefaultStacIO
 from requests import Request, Session
+from typing_extensions import TypeAlias
 
 import pystac_client
 

pystac_client/warnings.py

@@ -1,6 +1,6 @@
+import warnings
 from contextlib import contextmanager
 from typing import Iterator
-import warnings
 
 
 class PystacClientWarning(UserWarning):

tests/test_client.py

@@ -10,6 +10,8 @@
 import pytest
 from dateutil.tz import tzutc
 from pystac import MediaType
+from requests_mock import Mocker
+
 from pystac_client import Client, CollectionClient
 from pystac_client._utils import Modifiable
 from pystac_client.conformance import ConformanceClasses
@@ -23,7 +25,6 @@
     NoConformsTo,
     strict,
 )
-from requests_mock import Mocker
 
 from .helpers import STAC_URLS, TEST_DATA, read_data_file