Merge pull request #421 from olemke/fix-aster

Replace obsolete gdal import in aster

Author: olemke

.github/workflows/build-test.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

environment.yml

@@ -3,7 +3,7 @@ dependencies:
         - python>=3.9
         - cartopy
         - cython
-        - fsspec!=2023.12.0,!=2023.12.1
+        - fsspec!=2023.12.0,!=2023.12.1,!=2024.3.1
         - gdal
         - h5netcdf
         - keras

requirements.txt

@@ -1,6 +1,6 @@
 cartopy
 cython
-fsspec!=2023.12.0,!=2023.12.1
+fsspec!=2023.12.0,!=2023.12.1,!=2024.3.1
 gdal
 h5netcdf
 keras

setup.py

@@ -79,7 +79,7 @@
     include_package_data=True,
     install_requires=[
         "docutils",
-        "fsspec!=2023.12.0,!=2023.12.1",
+        "fsspec!=2023.12.0,!=2023.12.1,!=2024.3.1",
         "h5netcdf",
         "imageio",
         "matplotlib>=1.4",

typhon/cloudmask/aster.py

@@ -7,7 +7,7 @@
 import warnings
 from collections import namedtuple
 
-import gdal
+from osgeo import gdal
 import numpy as np
 from scipy import interpolate
 from skimage.measure import block_reduce
@@ -682,7 +682,7 @@ def sensor_angles(self, channel="1"):
         # sides therefore depend on the ascending / decending mode defined in the
         # meta data.
         flyingdir = self.meta["FLYINGDIRECTION"]
-        if flyingdir is "DE":
+        if flyingdir == "DE":
             n *= -1
 
         swath_widths = np.sum(np.isfinite(field), axis=1)
@@ -696,7 +696,7 @@ def sensor_angles(self, channel="1"):
         if channel != "3B":
             zenith = abs(n_angles)
 
-            if flyingdir is "DE":
+            if flyingdir == "DE":
                 azimuth[n_angles > 0] = 90 + S
                 azimuth[n_angles <= 0] = 270 + S
             else:
@@ -716,7 +716,7 @@ def sensor_angles(self, channel="1"):
             )
 
             x = np.rad2deg(np.arctan(0.6 / np.tan(np.deg2rad(n_angles))))
-            if flyingdir is "DE":
+            if flyingdir == "DE":
                 azimuth[n_angles > 0] = np.array(90 - x + S)[n_angles > 0]
                 azimuth[n_angles <= 0] = np.array(270 - x + S)[n_angles <= 0]
             else: