Support 1c and 1d (#62)

* add: support for s1c and s1d

* update gh_actions/cache to v4 per warning

* change(packaging): abandon setup.cfg for pyproject.toml

* change(examples): revert back to STACv1.0 and PROJ-EXTv1

* remove: python 3.8 from CI testing

* change(ci): conda env setup

remove command which installs sqlite 3.23, when
previous step creates "test" env w/ sqlite 3.45,

* change(ci): specify conda-forge as initial channel

* update pre-commit to use local hook for mypy

* add(ci): python 3.12 and 3.13 to the matrix

Author: ircwaves

.github/workflows/continuous-integration.yml

@@ -29,30 +29,33 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     defaults:
       run:
         shell: bash -l {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up conda cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/conda_pkgs_dir
           key: ${{ runner.os }}-conda-${{ hashFiles('**/environment.yml') }}
           restore-keys: ${{ runner.os }}-conda-
       - name: Set up pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.cfg', '**/requirements-dev.txt') }}
           restore-keys: ${{ runner.os }}-pip-
       - name: Set up Conda with Python ${{ matrix.python-version }}
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
+          channels: conda-forge,default
       - name: Update Conda's environemnt
-        run: conda env update -f environment.yml -n test
+        run: |
+          conda info --envs
+          conda env update -f environment.yml -n test
       - name: Execute linters and test suites
         run: ./scripts/cibuild

.pre-commit-config.yaml

@@ -16,13 +16,14 @@ repos:
       rev: 7.0.0
       hooks:
           - id: flake8
-    - repo: https://github.com/pre-commit/mirrors-mypy
-      rev: v1.8.0
+    - repo: local
       hooks:
           - id: mypy
-            additional_dependencies:
-                - click != 8.1.0
-                - stactools
+            name: mypy
+            entry: mypy
+            language: system
+            require_serial: true
+            types: [ python ]
     - repo: https://github.com/pycqa/isort
       rev: 5.13.2
       hooks:

CHANGELOG.md

@@ -11,6 +11,20 @@ number as needed.
 
 ## [Unreleased]
 
+### Fixed
+
+- Expanded regular expression to include Sentinel-1C and
+  1D. ([#62](https://github.com/stactools-packages/sentinel1/pull/62))
+- Fixed conda CI action, where `conda-forge` was not specified as primary
+  channel for installation, which was causing conflicts between library
+  versions.
+
+### Changed
+
+- mypy uses local hook instead of repo (repo was pulling type stubs for pystac
+  1.12) h/t @tylanderson.
+- moved from setup.cfg to pyproject.toml
+
 ## [0.8.0] - 2023-02-16
 
 ### Added

docker/Dockerfile

@@ -7,7 +7,7 @@ ENV PYTHON_VERSION=3.11
 WORKDIR $DOCKER_WORKDIR
 
 # For caching purposes, install dependencies but remove the actual package
-COPY pyproject.toml setup.cfg ./
+COPY pyproject.toml ./
 COPY src/$DOCKER_NAMESPACE_PACKAGE_DIR/__init__.py src/$DOCKER_NAMESPACE_PACKAGE_DIR/
 RUN pip install . --no-binary rasterio \
     && rm -r /opt/conda/lib/python$PYTHON_VERSION/site-packages/$DOCKER_NAMESPACE_PACKAGE_DIR

docker/Dockerfile-dev

@@ -11,7 +11,7 @@ RUN apt-get -y -q update \
     && rm -rf /var/lib/apt/lists/
 
 # For caching purposes, install dependencies but remove the actual package
-COPY pyproject.toml requirements-dev.txt setup.cfg ./
+COPY pyproject.toml requirements-dev.txt ./
 COPY src/$DOCKER_NAMESPACE_PACKAGE_DIR/__init__.py src/$DOCKER_NAMESPACE_PACKAGE_DIR/
 RUN pip install -r requirements-dev.txt \
     && pip install . --no-binary rasterio \

examples/grd/S1A_EW_GRDM_1SDH_20221130T014342_20221130T014446_046117_058549/S1A_EW_GRDM_1SDH_20221130T014342_20221130T014446_046117_058549.json

@@ -57,7 +57,7 @@
         "url": "https://earth.esa.int/eogateway"
       }
     ],
-    "platform": "SENTINEL-1A",
+    "platform": "sentinel-1a",
     "constellation": "sentinel-1",
     "start_datetime": "2022-11-30T01:43:42.546629Z",
     "end_datetime": "2022-11-30T01:44:46.839082Z",
@@ -247,7 +247,7 @@
   "stac_extensions": [
     "https://stac-extensions.github.io/sar/v1.0.0/schema.json",
     "https://stac-extensions.github.io/sat/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/projection/v1.1.0/schema.json"
   ],
   "collection": "sentinel1-grd"

examples/grd/S1A_IW_GRDH_1SDV_20210809T173953_20210809T174018_039156_049F13/S1A_IW_GRDH_1SDV_20210809T173953_20210809T174018_039156_049F13.json

@@ -57,7 +57,7 @@
         "url": "https://earth.esa.int/eogateway"
       }
     ],
-    "platform": "SENTINEL-1A",
+    "platform": "sentinel-1a",
     "constellation": "sentinel-1",
     "start_datetime": "2021-08-09T17:39:53.153776Z",
     "end_datetime": "2021-08-09T17:40:18.152800Z",
@@ -247,7 +247,7 @@
   "stac_extensions": [
     "https://stac-extensions.github.io/sar/v1.0.0/schema.json",
     "https://stac-extensions.github.io/sat/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/projection/v1.1.0/schema.json"
   ],
   "collection": "sentinel1-grd"

examples/grd/collection.json

@@ -34,7 +34,7 @@
   "stac_extensions": [
     "https://stac-extensions.github.io/sar/v1.0.0/schema.json",
     "https://stac-extensions.github.io/sat/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/item-assets/v1.0.0/schema.json"
   ],
   "item_assets": {

examples/rtc/sentinel1-rtc-aws/2016/S1B_20161121_12SYJ_ASC/S1B_20161121_12SYJ_ASC.json

@@ -35,7 +35,7 @@
     "gsd": 20,
     "start_datetime": "2016-11-21T01:09:10Z",
     "end_datetime": "2016-11-21T01:10:04Z",
-    "created": "2023-05-09T12:38:30.201553Z",
+    "created": "2025-05-08T17:20:29.669007Z",
     "mgrs:utm_zone": "12",
     "mgrs:latitude_band": "S",
     "mgrs:grid_square": "YJ",

examples/rtc/sentinel1-rtc-aws/2020/S1A_20200103_17RMJ_ASC/S1A_20200103_17RMJ_ASC.json

@@ -35,7 +35,7 @@
     "gsd": 20,
     "start_datetime": "2020-01-03T23:35:56Z",
     "end_datetime": "2020-01-03T23:36:46Z",
-    "created": "2023-05-09T12:38:23.143724Z",
+    "created": "2025-05-08T17:20:15.885836Z",
     "mgrs:utm_zone": "17",
     "mgrs:latitude_band": "R",
     "mgrs:grid_square": "MJ",