Merge branch 'main' into feature/classification-extension

Author: gadomski

.pre-commit-config.yaml

@@ -10,6 +10,7 @@ repos:
         language: system
         stages: [commit]
         types: [python]
+        args: [--fix, --exit-non-zero-on-fix]
 
       - id: black
         name: black

pyproject.toml

@@ -84,6 +84,10 @@ exclude = ["tests*", "benchmarks*"]
 [tool.setuptools.dynamic]
 version = { attr = "pystac.version.__version__" }
 
+[tool.ruff]
+line-length = 88
+select = ["E", "F", "I"]
+
 [tool.pytest]
 filterwarnings = "error:::pystac[.*]"
 

pystac/catalog.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from itertools import chain
-import warnings
 import os
+import warnings
 from copy import deepcopy
 from html import escape
+from itertools import chain
 from typing import (
     TYPE_CHECKING,
     Any,

pystac/extensions/raster.py

@@ -16,13 +16,13 @@
 )
 
 import pystac
+import pystac.extensions.item_assets as item_assets
 from pystac.extensions.base import (
     ExtensionManagementMixin,
     PropertiesExtension,
     SummariesExtension,
 )
 from pystac.extensions.hooks import ExtensionHooks
-import pystac.extensions.item_assets as item_assets
 from pystac.utils import StringEnum, get_opt, get_required, map_opt
 
 T = TypeVar("T", pystac.Asset, item_assets.AssetDefinition)

tests/extensions/test_grid.py

@@ -7,12 +7,13 @@
 from typing import Any, Dict
 
 import pytest
+
 import pystac
 from pystac import ExtensionTypeError
 from pystac.extensions import grid
 from pystac.extensions.grid import GridExtension
-from tests.utils import TestCases
 from tests.conftest import get_data_file
+from tests.utils import TestCases
 
 code = "MGRS-4CFJ"
 

tests/extensions/test_label.py

@@ -4,6 +4,8 @@
 import unittest
 from typing import List, Union
 
+import pytest
+
 import pystac
 import pystac.validation
 from pystac import Catalog, CatalogType, Collection, ExtensionTypeError, Item
@@ -19,9 +21,8 @@
     LabelType,
 )
 from pystac.utils import get_opt
-from tests.utils import TestCases, assert_to_from_dict
 from tests.conftest import get_data_file
-import pytest
+from tests.utils import TestCases, assert_to_from_dict
 
 
 class LabelTypeTest(unittest.TestCase):

tests/extensions/test_mgrs.py

@@ -1,10 +1,10 @@
 """Tests for pystac.tests.extensions.mgrs"""
 import json
+
 import pytest
+
 import pystac
 from pystac.extensions.mgrs import MgrsExtension
-
-
 from tests.conftest import get_data_file
 
 

tests/extensions/test_raster.py

@@ -2,6 +2,7 @@
 import unittest
 
 import pytest
+
 import pystac
 from pystac import ExtensionTypeError, Item
 from pystac.extensions.item_assets import ItemAssetsExtension
@@ -15,8 +16,8 @@
     Statistics,
 )
 from pystac.utils import get_opt
-from tests.utils import TestCases, assert_to_from_dict
 from tests.conftest import get_data_file
+from tests.utils import TestCases, assert_to_from_dict
 
 
 class RasterTest(unittest.TestCase):