fix: bitrot

.github/workflows/continuous-integration.yml

@@ -7,48 +7,33 @@ on:
   pull_request:
 
 jobs:
-  build:
-    name: docker
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Execute linters and test suites
-        run: ./docker/cibuild
-      - name: Upload All coverage to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.xml
-          fail_ci_if_error: false
   python-matrix:
     name: python-matrix
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.9"]
     defaults:
       run:
-        shell: bash -l {0}
+        shell: bash -el {0}
     steps:
       - uses: actions/checkout@v2
       - 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 }}
-      - name: Update Conda's environemnt
-        run: conda env update -f environment.yml -n test
+          environment-file: environment.yml
       - name: Execute linters and test suites
         run: ./scripts/cibuild

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.991
+    rev: v1.19.0
     hooks:
       - id: mypy
         args:
@@ -32,6 +32,7 @@ repos:
           - types-requests
           - types-setuptools
           - stactools
+          - pytest
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:

environment.yml

@@ -1,7 +1,7 @@
 name: stactools-modis
 channels:
   - conda-forge
-  - defaults
 dependencies:
-  - python = 3.9
+  - python >= 3.9
   - gdal >= 3.5.2
+  - libgdal-hdf4

mypy.ini

@@ -18,4 +18,4 @@ ignore_missing_imports = True
 ignore_missing_imports = True
 
 [mypy-multihash.*]
-ignore_missing_imports = True
+ignore_missing_imports = True

requirements-dev.txt

@@ -7,3 +7,5 @@ pre-commit
 pytest
 pytest-cov
 types-setuptools
+requests
+setuptools

setup.cfg

@@ -10,7 +10,7 @@ url = https://github.com/stactools-modis/stactools-modis
 project_urls =
     Documentation = https://stactools-modis.readthedocs.io/en/latest/
     Issues = https://github.com/stactools-modis/stactools-modis/issues
-keywords = 
+keywords =
     stactools
     pystac
     catalog
@@ -19,8 +19,6 @@ keywords =
 classifiers =
     Development Status :: 4 - Beta
     License :: OSI Approved :: Apache Software License
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
 
 [options]

src/stactools/modis/metadata.py

@@ -156,7 +156,7 @@ def get_exception(xpath: str) -> Exception:
 
         if qa_percent_cloud_cover and qa_percent_not_produced_cloud is None:
             assert len(set(qa_percent_cloud_cover.values())) == 1, (
-                f"Mutiple, different 'qa_percent_cloud_cover' values exist "
+                f"Multiple, different 'qa_percent_cloud_cover' values exist "
                 f"in href={href}. This is not supported at this time."
             )
             qa_percent_not_produced_cloud = next(iter(qa_percent_cloud_cover.values()))

tests/__init__.py

@@ -123,4 +123,4 @@ def create_external_data_dict() -> Dict[str, Dict[str, Any]]:
 
 external_data = create_external_data_dict()
 
-test_data = TestData(__file__, external_data=external_data)
+test_data = TestData(__file__, external_data=external_data)  # type: ignore

tests/data-files/expected/MCD12Q1/006/MCD12Q1.A2001001.h00v08.006/MCD12Q1.A2001001.h00v08.006.json

@@ -263,7 +263,7 @@
     10.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-12Q1-006"
 }

tests/data-files/expected/MCD12Q1/006/collection.json

@@ -158,7 +158,6 @@
     }
   },
   "license": "proprietary",
-  "keywords": [],
   "providers": [
     {
       "name": "NASA LP DAAC at the USGS EROS Center",

tests/data-files/expected/MCD15A2H/061/MCD15A2H.A2022025.h01v11.061/MCD15A2H.A2022025.h01v11.061.json

@@ -26,52 +26,52 @@
           -27.266667
         ],
         [
-          -180.0,
-          -20.0
-        ],
-        [
-          -170.268444,
-          -20.0
+          -178.596668,
+          -26.379167
         ],
         [
-          -170.780379,
-          -20.466667
+          -177.268567,
+          -25.5
         ],
         [
-          -171.316335,
-          -20.941667
+          -175.977753,
+          -24.604167
         ],
         [
-          -171.852812,
-          -21.404167
+          -174.742432,
+          -23.704167
         ],
         [
-          -172.40393,
-          -21.866667
+          -173.550944,
+          -22.791667
         ],
         [
           -172.9699,
           -22.329167
         ],
         [
-          -173.550944,
-          -22.791667
+          -172.40393,
+          -21.866667
         ],
         [
-          -174.742432,
-          -23.704167
+          -171.852812,
+          -21.404167
         ],
         [
-          -175.977753,
-          -24.604167
+          -171.316335,
+          -20.941667
         ],
         [
-          -177.268567,
-          -25.5
+          -170.780379,
+          -20.466667
         ],
         [
-          -178.596668,
-          -26.379167
+          -170.268444,
+          -20.0
+        ],
+        [
+          -180.0,
+          -20.0
         ],
         [
           -180.0,
@@ -125,7 +125,7 @@
     -20.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-15A2H-061"
 }

tests/data-files/expected/MCD15A3H/061/MCD15A3H.A2022033.h12v10.061/MCD15A3H.A2022033.h12v10.061.json

@@ -145,7 +145,7 @@
     -10.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-15A3H-061"
 }

tests/data-files/expected/MCD43A4.A2022073.h28v08.006.2022082044758_B01_cropped.json

@@ -237,8 +237,8 @@
     10.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/projection/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/projection/v1.1.0/schema.json",
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/raster/v1.1.0/schema.json"
   ]
 }

tests/data-files/expected/MCD43A4/006/MCD43A4.A2022019.h10v04.006/MCD43A4.A2022019.h10v04.006.json

@@ -209,7 +209,7 @@
     50.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-43A4-006"
 }

tests/data-files/expected/MCD43A4/006/collection.json

@@ -28,7 +28,7 @@
   ],
   "stac_extensions": [
     "https://stac-extensions.github.io/classification/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/raster/v1.1.0/schema.json",
     "https://stac-extensions.github.io/item-assets/v1.0.0/schema.json"
   ],
@@ -427,7 +427,6 @@
     }
   },
   "license": "proprietary",
-  "keywords": [],
   "providers": [
     {
       "name": "NASA LP DAAC at the USGS EROS Center",

tests/data-files/expected/MCD43A4/061/MCD43A4.A2022032.h14v10.061/MCD43A4.A2022032.h14v10.061.json

@@ -145,7 +145,7 @@
     -10.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-43A4-061"
 }

tests/data-files/expected/MCD43A4/061/collection.json

@@ -38,7 +38,7 @@
   ],
   "stac_extensions": [
     "https://stac-extensions.github.io/classification/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/raster/v1.1.0/schema.json",
     "https://stac-extensions.github.io/item-assets/v1.0.0/schema.json",
     "https://stac-extensions.github.io/scientific/v1.0.0/schema.json"

tests/data-files/expected/MCD64A1/061/MCD64A1.A2021335.h10v06.061/MCD64A1.A2021335.h10v06.061.json

@@ -209,7 +209,7 @@
     30.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-64A1-061"
 }

tests/data-files/expected/MOD09A1/061/MOD09A1.A2022033.h19v10.061/MOD09A1.A2022033.h19v10.061.json

@@ -129,7 +129,7 @@
     -10.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-09A1-061"
 }

tests/data-files/expected/MOD09A1/061/collection.json

@@ -47,7 +47,7 @@
     }
   ],
   "stac_extensions": [
-    "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/raster/v1.1.0/schema.json",
     "https://stac-extensions.github.io/item-assets/v1.0.0/schema.json",
     "https://stac-extensions.github.io/scientific/v1.0.0/schema.json"

tests/data-files/expected/MOD09Q1/061/MOD09Q1.A2022033.h10v10.061/MOD09Q1.A2022033.h10v10.061.json

@@ -209,7 +209,7 @@
     -10.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-09Q1-061"
 }

tests/data-files/expected/MOD09Q1/061/collection.json

@@ -47,7 +47,7 @@
     }
   ],
   "stac_extensions": [
-    "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/raster/v1.1.0/schema.json",
     "https://stac-extensions.github.io/item-assets/v1.0.0/schema.json",
     "https://stac-extensions.github.io/scientific/v1.0.0/schema.json"

tests/data-files/expected/MOD10A1/006/MOD10A1.A2022029.h10v05.006/MOD10A1.A2022029.h10v05.006.json

@@ -209,7 +209,7 @@
     40.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-10A1-006"
 }

tests/data-files/expected/MOD10A1/006/collection.json

@@ -111,7 +111,6 @@
     }
   },
   "license": "proprietary",
-  "keywords": [],
   "providers": [
     {
       "name": "NASA NSIDC DAAC at CIRES",

tests/data-files/expected/MOD10A1/061/MOD10A1.A2022040.h11v05.061/MOD10A1.A2022040.h11v05.061.json

@@ -209,7 +209,7 @@
     40.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json"
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json"
   ],
   "collection": "modis-10A1-061"
 }

tests/data-files/expected/MOD10A2/061/MOD10A2.A2022033.h09v05.061/MOD10A2.A2022033.h09v05.061.json

@@ -320,8 +320,8 @@
     40.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/projection/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/projection/v1.1.0/schema.json",
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/raster/v1.1.0/schema.json",
     "https://stac-extensions.github.io/classification/v1.0.0/schema.json"
   ],

tests/data-files/expected/MOD11A1.A2022103.h09v05.006.2022104093154_CDC_B11_cropped.json

@@ -164,8 +164,8 @@
     40.0
   ],
   "stac_extensions": [
-    "https://stac-extensions.github.io/projection/v1.0.0/schema.json",
-    "https://stac-extensions.github.io/eo/v1.0.0/schema.json",
+    "https://stac-extensions.github.io/projection/v1.1.0/schema.json",
+    "https://stac-extensions.github.io/eo/v1.1.0/schema.json",
     "https://stac-extensions.github.io/raster/v1.1.0/schema.json"
   ]
 }