Update ls4-7 band aliases

.github/workflows/docker.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout Git
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Determine Docker info from repo
         id: meta
@@ -39,17 +39,17 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.GADOCKERSVC_USERNAME }}
           password: ${{ secrets.GADOCKERSVC_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           builder: ${{ steps.buildx.outputs.name }}

eodatasets3/prepare/landsat_l1_prepare.py

@@ -155,6 +155,10 @@
     "emissivity": "emissivity",
     "emissivity_stdev": "emissivity_stdev",
     "cloud_distance": "cloud_distance",
+    "angle_sensor_azimuth_band_4": "view_azimuth",
+    "angle_sensor_zenith_band_4": "view_zenith",
+    "angle_solar_azimuth_band_4": "solar_azimuth",
+    "angle_solar_zenith_band_4": "solar_zenith",
 }
 
 MTL_PAIRS_RE = re.compile(r"(\w+)\s=\s(.*)")

requirements/deployment.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile --extra=deployment --extra=docker --output-file=requirements/deployment.txt
 #
@@ -9,12 +9,13 @@ affine==2.3.1
     #   datacube
     #   eodatasets3 (setup.py)
     #   rasterio
-attrs==22.1.0
+attrs==23.1.0
     # via
     #   cattrs
     #   eodatasets3 (setup.py)
     #   jsonschema
     #   rasterio
+    #   referencing
 boltons==21.0.0
     # via eodatasets3 (setup.py)
 boto3==1.24.94
@@ -63,8 +64,6 @@ defusedxml==0.7.1
     # via eodatasets3 (setup.py)
 distributed==2022.10.0
     # via datacube
-exceptiongroup==1.0.0rc9
-    # via cattrs
 fsspec==2022.10.0
     # via dask
 gdal==3.3.2
@@ -77,18 +76,18 @@ h5py==3.7.0
     # via eodatasets3 (setup.py)
 heapdict==1.0.1
     # via zict
-importlib-resources==5.10.0
-    # via jsonschema
 jinja2==3.1.2
     # via distributed
 jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-jsonschema==4.16.0
+jsonschema==4.20.0
     # via
     #   datacube
     #   eodatasets3 (setup.py)
+jsonschema-specifications==2023.11.2
+    # via jsonschema
 lark==1.1.3
     # via datacube
 locket==1.0.0
@@ -126,8 +125,6 @@ pandas==1.5.1
     #   xarray
 partd==1.3.0
     # via dask
-pkgutil-resolve-name==1.3.10
-    # via jsonschema
 psutil==5.9.3
     # via distributed
 psycopg2==2.9.4
@@ -140,9 +137,7 @@ pyproj==3.4.0
     # via
     #   datacube
     #   eodatasets3 (setup.py)
-pyrsistent==0.18.1
-    # via jsonschema
-pystac==1.6.1
+pystac==1.8.4
     # via eodatasets3 (setup.py)
 python-dateutil==2.8.2
     # via
@@ -163,10 +158,16 @@ rasterio==1.3.3
     # via
     #   datacube
     #   eodatasets3 (setup.py)
+referencing==0.31.1
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+rpds-py==0.13.2
+    # via
+    #   jsonschema
+    #   referencing
 ruamel-yaml==0.17.21
     # via eodatasets3 (setup.py)
-ruamel-yaml-clib==0.2.6
-    # via ruamel-yaml
 s3transfer==0.6.0
     # via boto3
 scipy==1.9.3
@@ -207,8 +208,6 @@ xarray==2022.10.0
     #   eodatasets3 (setup.py)
 zict==2.2.0
     # via distributed
-zipp==3.9.0
-    # via importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/setup.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile requirements/setup.in
 #
@@ -33,25 +33,25 @@ packaging==21.3
 pep517==0.13.0
     # via build
 pip-tools==6.9.0
-    # via -r setup.in
+    # via -r requirements/setup.in
 platformdirs==2.5.2
     # via virtualenv
 pluggy==1.0.0
     # via pytest
 pre-commit==2.20.0
-    # via -r setup.in
+    # via -r requirements/setup.in
 py==1.11.0
     # via pytest
 pydantic==1.10.2
-    # via -r setup.in
+    # via -r requirements/setup.in
 pyparsing==3.0.9
     # via packaging
 pyproj==3.4.0
-    # via -r setup.in
+    # via -r requirements/setup.in
 pytest==7.1.3
     # via pytest-cov
 pytest-cov==4.0.0
-    # via -r setup.in
+    # via -r requirements/setup.in
 pyyaml==6.0
     # via pre-commit
 toml==0.10.2

requirements/test.txt

@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile --extra=docker --extra=test --output-file=requirements/test.txt
 #
@@ -11,14 +11,15 @@ affine==2.3.1
     #   rasterio
 alabaster==0.7.12
     # via sphinx
-attrs==22.1.0
+attrs==23.1.0
     # via
     #   cattrs
     #   eodatasets3 (setup.py)
     #   jsonschema
     #   morecantile
     #   pytest
     #   rasterio
+    #   referencing
 babel==2.10.3
     # via sphinx
 boltons==21.0.0
@@ -81,8 +82,6 @@ docutils==0.17.1
     # via
     #   sphinx
     #   sphinx-rtd-theme
-exceptiongroup==1.0.0rc9
-    # via cattrs
 flake8==5.0.4
     # via pep8-naming
 fsspec==2022.10.0
@@ -103,10 +102,6 @@ imageio==2.22.2
     # via scikit-image
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==5.0.0
-    # via sphinx
-importlib-resources==5.10.0
-    # via jsonschema
 iniconfig==1.1.1
     # via pytest
 jinja2==3.1.2
@@ -117,10 +112,12 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-jsonschema==4.16.0
+jsonschema==4.20.0
     # via
     #   datacube
     #   eodatasets3 (setup.py)
+jsonschema-specifications==2023.11.2
+    # via jsonschema
 lark==1.1.3
     # via datacube
 locket==1.0.0
@@ -184,8 +181,6 @@ pillow==9.3.0
     # via
     #   imageio
     #   scikit-image
-pkgutil-resolve-name==1.3.10
-    # via jsonschema
 pluggy==1.0.0
     # via pytest
 psutil==5.9.3
@@ -213,9 +208,7 @@ pyproj==3.4.0
     #   datacube
     #   eodatasets3 (setup.py)
     #   morecantile
-pyrsistent==0.18.1
-    # via jsonschema
-pystac==1.6.1
+pystac==1.8.4
     # via eodatasets3 (setup.py)
 pytest==7.1.3
     # via eodatasets3 (setup.py)
@@ -243,14 +236,20 @@ rasterio==1.3.3
     #   datacube
     #   eodatasets3 (setup.py)
     #   rio-cogeo
+referencing==0.31.1
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
 requests==2.31.0
     # via sphinx
 rio-cogeo==3.4.1
     # via eodatasets3 (setup.py)
+rpds-py==0.13.2
+    # via
+    #   jsonschema
+    #   referencing
 ruamel-yaml==0.17.21
     # via eodatasets3 (setup.py)
-ruamel-yaml-clib==0.2.6
-    # via ruamel-yaml
 s3transfer==0.6.0
     # via boto3
 scikit-image==0.19.3
@@ -324,10 +323,6 @@ xarray==2022.10.0
     #   eodatasets3 (setup.py)
 zict==2.2.0
     # via distributed
-zipp==3.9.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

setup.py

@@ -77,7 +77,7 @@
         "click",
         "defusedxml",
         "h5py",
-        "jsonschema>=3",  # We want a Draft6Validator
+        "jsonschema>=4.18",  # We want a Draft6Validator
         "numpy>=1.15.4",
         "pyproj",
         "rasterio",
@@ -88,7 +88,7 @@
         "xarray",
         "datacube",
         "python-rapidjson",
-        "pystac>=1.7",
+        "pystac==1.8.4",
     ],
     tests_require=tests_require,
     extras_require=EXTRAS_REQUIRE,