fix: drivers have been separated out of the gdal conda, bump min pyth…

…on to 3.10 (#480)

* fix: drivers have been separated out of the gdal conda

* fix: bump min python to 3.10

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

* feat: update pre-commit

* fix: remove more broken stuff

.github/workflows/continuous-integration.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     defaults:
       run:
         shell: bash -l {0}
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     defaults:
       run:
         shell: bash -l {0}
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     defaults:
       run:
         shell: bash -l {0}
@@ -73,7 +73,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     defaults:
       run:
         shell: bash -l {0}
@@ -88,23 +88,6 @@ jobs:
         run: pip install -U --pre pystac rasterio --no-binary rasterio
       - name: Run tests
         run: scripts/test
-  codecov:
-    name: Codecov
-    needs:
-      - standard
-      - extra-requires
-      - minimum-versions
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Execute linters and test suites
-        run: ./docker/cibuild
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.xml
-          fail_ci_if_error: false
   docker:
     name: Docker
     needs:

.pre-commit-config.yaml

@@ -3,26 +3,26 @@
 
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.265
+    rev: v0.8.4
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.10.0
     hooks:
       - id: black
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.4
+    rev: v2.3.0
     hooks:
       - id: codespell
         args: [--ignore-words=.codespellignore]
         types_or: [jupyter, markdown, python, shell]
   - repo: https://github.com/PyCQA/doc8
-    rev: v1.1.1
+    rev: v1.1.2
     hooks:
       - id: doc8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.3.0
+    rev: v1.14.0
     hooks:
       - id: mypy
         # TODO lint test and scripts too

README.md

@@ -162,12 +162,6 @@ Once the container is built, you can run the `scripts/` scripts inside a docker
 docker/console
 ```
 
-A complete build and test can be run with:
-
-```sh
-docker/cibuild
-```
-
 In scenarios where you want to run scripts in `docker/` but don't want to run the build, images can be downloaded via the `pull` script:
 
 ```sh

docs/index.rst

@@ -19,7 +19,7 @@ See the `stactools-packages website <https://stactools-packages.github.io>`_ and
 Requirements
 ============
 
-* `Python 3.8 or greater <https://www.python.org/>`_
+* `Python 3.10 or greater <https://www.python.org/>`_
 
 STAC version support
 ====================

environment.yml

@@ -3,8 +3,8 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - conda-forge::gdal>=3.3
+  - conda-forge::gdal>=3.10
   - conda-forge::geos>=3.3
   - conda-forge::rasterio>=1.3
-  - conda-forge::libstdcxx-ng # gdal dependency. Make sure it's from the same channel as gdal
-  - conda-forge::libarchive # gdal dependency. Make sure it's from the same channel as gdal
+  - conda-forge::libgdal-hdf5
+  - conda-forge::libgdal-jp2openjpeg

pyproject.toml

@@ -12,12 +12,12 @@ keywords = ["pystac", "imagery", "raster", "catalog", "STAC"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
     "antimeridian>=0.2.6",
     "click>=8.1.3",
@@ -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/add_raster.py

@@ -69,7 +69,10 @@ def _read_bands(href: str, statistics: bool, histogram: bool) -> List[RasterBand
                         data, range=(minimum, maximum), bins=BINS
                     )
                     band.histogram = Histogram.create(
-                        BINS, minimum, maximum, hist_data.tolist()
+                        BINS,
+                        minimum,
+                        maximum,
+                        hist_data.tolist(),  # type: ignore
                     )
             bands.append(band)
     return bands

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