fix: reformat, remove tests that check behavior of other libs

Author: gadomski

pyproject.toml

@@ -54,7 +54,7 @@ dev = [
     "pytest-cov~=3.0",
     "pytest~=7.3",
     "requests>=2.27.1",
-    "ruff==0.0.265",
+    "ruff~=0.8.0",
     "types-certifi~=2021.10.8",
     "types-orjson~=3.6",
     "types-python-dateutil~=2.8",
@@ -82,7 +82,7 @@ version = { attr = "stactools.core.__version__" }
 
 [tool.ruff]
 line-length = 88
-select = ["E", "F", "I"]
+lint.select = ["E", "F", "I"]
 
 [tool.mypy]
 mypy_path = "src"

scripts/rewrite_test_data.py

@@ -37,9 +37,9 @@ def remap_property(item: Item, before: str, after: str) -> None:
             for i, interval in enumerate(collection.extent.temporal.intervals):
                 for j, datetime in enumerate(interval):
                     if datetime:
-                        collection.extent.temporal.intervals[i][
-                            j
-                        ] = datetime.astimezone(UTC)
+                        collection.extent.temporal.intervals[i][j] = (
+                            datetime.astimezone(UTC)
+                        )
 
         if object.STAC_OBJECT_TYPE == "Feature":
             item = cast(Item, object)

src/stactools/cli/cli.py

@@ -2,6 +2,7 @@
 from typing import Union
 
 import click
+
 from stactools.cli import registry
 
 

src/stactools/cli/commands/add.py

@@ -2,6 +2,7 @@
 
 import click
 from pystac import Catalog, Item, read_file
+
 from stactools.core import add_item
 
 

src/stactools/cli/commands/add_asset.py

@@ -3,6 +3,7 @@
 import click
 import pystac
 import pystac.utils
+
 from stactools.core import add_asset
 
 

src/stactools/cli/commands/add_raster.py

@@ -1,5 +1,6 @@
 import click
 import pystac
+
 from stactools.core import add_raster_to_item
 
 

src/stactools/cli/commands/copy.py

@@ -3,6 +3,7 @@
 import click
 import pystac
 from pystac.utils import make_absolute_href
+
 from stactools.core.copy import copy_catalog, move_all_assets
 
 

src/stactools/cli/commands/create.py

@@ -3,6 +3,7 @@
 from typing import List
 
 import click
+
 from stactools.core import create
 
 

src/stactools/cli/commands/layout.py

@@ -1,5 +1,6 @@
 import click
 import pystac
+
 from stactools.core import layout_catalog
 
 

src/stactools/cli/commands/merge.py

@@ -2,6 +2,7 @@
 
 import click
 import pystac
+
 from stactools.core import merge_all_items
 
 

src/stactools/cli/commands/migrate.py

@@ -1,5 +1,6 @@
 import click
 import pystac
+
 from stactools.core import migrate_object
 
 

src/stactools/cli/commands/summary.py

@@ -9,7 +9,7 @@
 def format_summary(summary: Dict[str, Any], indent: int = 4) -> str:
     out = ""
     for var in summary:
-        if type(summary[var]) == dict:
+        if summary[var] is dict:
             out += var + ": \n" + " " * indent + str(summary[var]) + "\n"
         else:
             out += var + ": " + str(summary[var]) + "\n"

src/stactools/cli/commands/update_geometry.py

@@ -3,6 +3,7 @@
 import click
 from click import Command, Group
 from pystac import Item
+
 from stactools.core.utils import raster_footprint
 
 

src/stactools/cli/commands/version.py

@@ -2,6 +2,7 @@
 from click import echo
 from click.core import Command, Group
 from pystac.version import get_stac_version
+
 from stactools.core import __version__
 
 

src/stactools/core/add.py

@@ -4,6 +4,7 @@
 
 from pystac import Catalog, Collection, Item
 from pystac.layout import BestPracticesLayoutStrategy
+
 from stactools.core.copy import move_assets as do_move_assets
 
 

src/stactools/core/add_asset.py

@@ -4,6 +4,7 @@
 
 from pystac import Asset, Collection, Item
 from pystac.utils import is_absolute_href, make_relative_href
+
 from stactools.core.copy import move_asset_file
 
 logger = logging.getLogger(__name__)

src/stactools/core/create.py

@@ -4,10 +4,11 @@
 
 import rasterio
 import shapely.geometry
-import stactools.core.projection
 from pystac import Asset, Item
 from pystac.extensions.projection import ProjectionExtension
 
+import stactools.core.projection
+
 from .io import ReadHrefModifier
 
 

src/stactools/core/geometry.py

@@ -46,5 +46,4 @@ class GeoInterface(Protocol):
     extract geometries from objects.
     """
 
-    def __geo_interface__(self) -> Dict[str, Any]:
-        ...
+    def __geo_interface__(self) -> Dict[str, Any]: ...

src/stactools/core/io/__init__.py

@@ -6,6 +6,7 @@
 import fsspec
 from pystac.link import HREF
 from pystac.stac_io import StacIO
+
 from stactools.core import utils
 
 ReadHrefModifier = Callable[[str], str]

src/stactools/core/io/xml.py

@@ -3,6 +3,7 @@
 
 from lxml import etree
 from lxml.etree import _Element as lxmlElement
+
 from stactools.core.io import ReadHrefModifier, read_text
 
 

src/stactools/core/layout.py

@@ -2,6 +2,7 @@
 
 from pystac import Catalog
 from pystac.layout import TemplateLayoutStrategy
+
 from stactools.core import move_all_assets
 
 

src/stactools/core/merge.py

@@ -5,6 +5,7 @@
 from pystac.layout import BestPracticesLayoutStrategy
 from pystac.utils import is_absolute_href, make_relative_href
 from shapely.geometry import mapping, shape
+
 from stactools.core.copy import copy_catalog, move_asset_file
 from stactools.core.copy import move_assets as do_move_assets
 

src/stactools/core/utils/convert.py

@@ -6,6 +6,7 @@
 import rasterio
 import rasterio.shutil
 from rasterio.errors import DriverRegistrationError
+
 from stactools.core import utils
 
 DEFAULT_PROFILE = {

src/stactools/core/utils/raster_footprint.py

@@ -17,6 +17,7 @@
 from shapely.geometry.multipolygon import MultiPolygon
 from shapely.geometry.polygon import Polygon, orient
 from shapely.ops import unary_union
+
 from stactools.core.geometry import mutual_intersection
 
 from ..projection import reproject_shape

src/stactools/testing/cli.py

@@ -1,10 +1,12 @@
 """CLI for test data maintenance and generation."""
+
 import logging
 import os
 import shutil
 from tempfile import TemporaryDirectory
 
 import click
+
 from stactools.core.utils.subprocess import call
 
 logger = logging.getLogger(__name__)

tests/cli/commands/test_add.py

@@ -2,8 +2,8 @@
 import pystac.utils
 import pytest
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_add_asset.py

@@ -3,8 +3,8 @@
 import pystac
 import pystac.utils
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_add_raster.py

@@ -1,8 +1,8 @@
 import pystac
 import pystac.utils
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests.conftest import expected_json
 
 

tests/cli/commands/test_copy.py

@@ -4,8 +4,8 @@
 import pystac
 import pystac.utils
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_create.py

@@ -1,8 +1,8 @@
 import json
 
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_info.py

@@ -1,5 +1,6 @@
 import pystac
 from click.testing import CliRunner
+
 from stactools.cli.cli import cli
 
 

tests/cli/commands/test_lint.py

@@ -1,20 +1,12 @@
 import pytest
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 pytest.importorskip("stac_check")
 
 
-def test_valid_item() -> None:
-    path = test_data.get_path("data-files/linting/20201211_223832_cs2.json")
-
-    runner = CliRunner()
-    result = runner.invoke(cli, ["lint", path])
-    assert result.exit_code == 0
-
-
 def test_invalid_item() -> None:
     path = test_data.get_path("data-files/linting/core-item.json")
 

tests/cli/commands/test_merge.py

@@ -5,9 +5,9 @@
 import pystac
 import pytest
 from click.testing import CliRunner
+
 from stactools.cli.cli import cli
 from stactools.core import move_all_assets
-
 from tests import test_data
 
 

tests/cli/commands/test_migrate.py

@@ -4,8 +4,8 @@
 import pystac
 import pytest
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_summary.py

@@ -1,6 +1,6 @@
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_update_extent.py

@@ -1,6 +1,6 @@
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_update_geometry.py

@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 

tests/cli/commands/test_validate.py

@@ -1,7 +1,7 @@
 import pytest
 from click.testing import CliRunner
-from stactools.cli.cli import cli
 
+from stactools.cli.cli import cli
 from tests import test_data
 
 pytest.importorskip("stac_validator")

tests/cli/commands/test_version.py

@@ -1,6 +1,7 @@
 import pystac
-import stactools
 from click.testing import CliRunner
+
+import stactools
 from stactools.cli.cli import cli
 from stactools.core.utils.subprocess import call
 

tests/core/test_add_asset.py

@@ -4,8 +4,8 @@
 
 import pystac
 import pytest
-from stactools.core import add_asset, add_asset_to_item
 
+from stactools.core import add_asset, add_asset_to_item
 from tests import test_data
 
 

tests/core/test_add_raster.py

@@ -7,6 +7,7 @@
 import rasterio
 from rasterio.crs import CRS
 from rasterio.transform import Affine
+
 from stactools.core import create
 from stactools.core.add_raster import add_raster_to_item
 

tests/core/test_create.py

@@ -3,8 +3,8 @@
 
 import pytest
 from pystac.extensions.projection import ProjectionExtension
-from stactools.core import create
 
+from stactools.core import create
 from tests import test_data