From ad1815ef9cb778c922672fb57a187027ad0e0b26 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Wed, 6 Jan 2021 11:07:58 -0800 Subject: [PATCH] Modernize gdal imports GDAL has dropped support for the older toplevel `import gdal` in version 3.2, now requiring `from osgeo import gdal`. --- components/isceobj/StripmapProc/runInterferogram.py | 2 +- contrib/UnwrapComp/unwrapComponents.py | 2 +- contrib/stack/stripmapStack/MaskAndFilter.py | 4 ++-- contrib/stack/stripmapStack/estimateIono.py | 2 +- contrib/stack/stripmapStack/geocodeGdal.py | 2 +- contrib/stack/stripmapStack/invertOffsets.py | 2 +- contrib/stack/stripmapStack/prepStripmap4timeseries.py | 4 ++-- contrib/stack/stripmapStack/reader.py | 4 ++-- contrib/stack/stripmapStack/resampleOffsets.py | 5 ++--- contrib/stack/stripmapStack/rubberSheeting.py | 5 ++--- contrib/stack/stripmapStack/saveKml.py | 2 +- contrib/stack/stripmapStack/splitSpectrum.py | 2 +- contrib/stack/stripmapStack/splitSpectrum_multiple.py | 2 +- contrib/stack/stripmapStack/topo.py | 2 +- contrib/stack/topsStack/MaskAndFilter.py | 4 ++-- contrib/stack/topsStack/extractCommonValidRegion.py | 2 +- contrib/stack/topsStack/generateIgram.py | 2 +- contrib/stack/topsStack/geocodeGdal.py | 2 +- contrib/stack/topsStack/grossOffsets.py | 2 +- contrib/stack/topsStack/prep4timeseries.py | 4 ++-- contrib/stack/topsStack/rubberSheeting.py | 5 ++--- contrib/stack/topsStack/saveKml.py | 2 +- contrib/stack/topsStack/unwrap.py | 2 +- .../timeseries/prepStackToStaMPS/bin/step_baseline_stack.py | 2 +- 24 files changed, 32 insertions(+), 35 deletions(-) diff --git a/components/isceobj/StripmapProc/runInterferogram.py b/components/isceobj/StripmapProc/runInterferogram.py index 58168bc..89d5263 100644 --- a/components/isceobj/StripmapProc/runInterferogram.py +++ b/components/isceobj/StripmapProc/runInterferogram.py @@ -9,7 +9,7 @@ import logging from components.stdproc.stdproc import crossmul from iscesys.ImageUtil.ImageUtil import ImageUtil as IU import os -import gdal +from osgeo import gdal import numpy as np logger = logging.getLogger('isce.insar.runInterferogram') diff --git a/contrib/UnwrapComp/unwrapComponents.py b/contrib/UnwrapComp/unwrapComponents.py index 47499a1..272a7b5 100755 --- a/contrib/UnwrapComp/unwrapComponents.py +++ b/contrib/UnwrapComp/unwrapComponents.py @@ -7,7 +7,7 @@ import isce import isceobj from imageMath import IML from osgeo import gdal -from gdalconst import * +from osgeo.gdalconst import * import logging import scipy.spatial as SS diff --git a/contrib/stack/stripmapStack/MaskAndFilter.py b/contrib/stack/stripmapStack/MaskAndFilter.py index d9277a7..b32dbca 100755 --- a/contrib/stack/stripmapStack/MaskAndFilter.py +++ b/contrib/stack/stripmapStack/MaskAndFilter.py @@ -9,8 +9,8 @@ import argparse import numpy as np from scipy import ndimage import matplotlib.pyplot as plt -import gdal -from gdalconst import GA_ReadOnly +from osgeo import gdal +from osgeo.gdalconst import GA_ReadOnly # suppress the DEBUG message import logging diff --git a/contrib/stack/stripmapStack/estimateIono.py b/contrib/stack/stripmapStack/estimateIono.py index 1a84252..896158a 100755 --- a/contrib/stack/stripmapStack/estimateIono.py +++ b/contrib/stack/stripmapStack/estimateIono.py @@ -9,7 +9,7 @@ import isce import isceobj from isceobj.Constants import SPEED_OF_LIGHT import numpy as np -import gdal +from osgeo import gdal import shelve from scipy import ndimage diff --git a/contrib/stack/stripmapStack/geocodeGdal.py b/contrib/stack/stripmapStack/geocodeGdal.py index 5725e29..2616080 100755 --- a/contrib/stack/stripmapStack/geocodeGdal.py +++ b/contrib/stack/stripmapStack/geocodeGdal.py @@ -7,7 +7,7 @@ import argparse import isce import isceobj import os -import gdal +from osgeo import gdal import xml.etree.ElementTree as ET def createParser(): diff --git a/contrib/stack/stripmapStack/invertOffsets.py b/contrib/stack/stripmapStack/invertOffsets.py index 935cabb..7fa1293 100755 --- a/contrib/stack/stripmapStack/invertOffsets.py +++ b/contrib/stack/stripmapStack/invertOffsets.py @@ -15,7 +15,7 @@ from isceobj.Util.Poly2D import Poly2D import h5py from insarPair import insarPair from insarStack import insarStack -import gdal +from osgeo import gdal ################################################################# diff --git a/contrib/stack/stripmapStack/prepStripmap4timeseries.py b/contrib/stack/stripmapStack/prepStripmap4timeseries.py index 482c560..1a610c9 100755 --- a/contrib/stack/stripmapStack/prepStripmap4timeseries.py +++ b/contrib/stack/stripmapStack/prepStripmap4timeseries.py @@ -8,8 +8,8 @@ import os import glob import isce import isceobj -import gdal -from gdalconst import GA_ReadOnly +from osgeo import gdal +from osgeo.gdalconst import GA_ReadOnly #import s1a_isce_utils as ut from isceobj.Planet.Planet import Planet import shelve diff --git a/contrib/stack/stripmapStack/reader.py b/contrib/stack/stripmapStack/reader.py index 7e86e90..2a1d1ed 100755 --- a/contrib/stack/stripmapStack/reader.py +++ b/contrib/stack/stripmapStack/reader.py @@ -2,8 +2,8 @@ # Heresh Fattahi import os -import gdal -from gdalconst import GA_ReadOnly +from osgeo import gdal +from osgeo.gdalconst import GA_ReadOnly import numpy as np from lxml import objectify diff --git a/contrib/stack/stripmapStack/resampleOffsets.py b/contrib/stack/stripmapStack/resampleOffsets.py index 041b277..8928fa7 100755 --- a/contrib/stack/stripmapStack/resampleOffsets.py +++ b/contrib/stack/stripmapStack/resampleOffsets.py @@ -7,9 +7,8 @@ import os import isce import isceobj import shelve -import gdal -import osr -from gdalconst import GA_ReadOnly +from osgeo import gdal, osr +from osgeo.gdalconst import GA_ReadOnly from scipy import ndimage diff --git a/contrib/stack/stripmapStack/rubberSheeting.py b/contrib/stack/stripmapStack/rubberSheeting.py index efa7831..f64f5b3 100755 --- a/contrib/stack/stripmapStack/rubberSheeting.py +++ b/contrib/stack/stripmapStack/rubberSheeting.py @@ -8,9 +8,8 @@ import os import isce import isceobj import shelve -import gdal -import osr -from gdalconst import GA_ReadOnly +from osgeo import gdal, osr +from osgeo.gdalconst import GA_ReadOnly from scipy import ndimage diff --git a/contrib/stack/stripmapStack/saveKml.py b/contrib/stack/stripmapStack/saveKml.py index 022dbac..4d9d171 100755 --- a/contrib/stack/stripmapStack/saveKml.py +++ b/contrib/stack/stripmapStack/saveKml.py @@ -7,7 +7,7 @@ import argparse import isce import isceobj import os -import gdal +from osgeo import gdal import matplotlib as mpl; #mpl.use('Agg') import matplotlib.pyplot as plt from pykml.factory import KML_ElementMaker as KML diff --git a/contrib/stack/stripmapStack/splitSpectrum.py b/contrib/stack/stripmapStack/splitSpectrum.py index 5a71ef3..ef74ec7 100755 --- a/contrib/stack/stripmapStack/splitSpectrum.py +++ b/contrib/stack/stripmapStack/splitSpectrum.py @@ -16,7 +16,7 @@ import time #import matplotlib.pyplot as plt from contrib.splitSpectrum import SplitRangeSpectrum as splitSpectrum from isceobj.Constants import SPEED_OF_LIGHT -import gdal +from osgeo import gdal def createParser(): diff --git a/contrib/stack/stripmapStack/splitSpectrum_multiple.py b/contrib/stack/stripmapStack/splitSpectrum_multiple.py index bd7c5e2..ff29a86 100755 --- a/contrib/stack/stripmapStack/splitSpectrum_multiple.py +++ b/contrib/stack/stripmapStack/splitSpectrum_multiple.py @@ -16,7 +16,7 @@ import time #import matplotlib.pyplot as plt from contrib.splitSpectrum import SplitRangeSpectrum as splitSpectrum from isceobj.Constants import SPEED_OF_LIGHT -import gdal +from osgeo import gdal def createParser(): diff --git a/contrib/stack/stripmapStack/topo.py b/contrib/stack/stripmapStack/topo.py index d88f83d..5b32c1f 100755 --- a/contrib/stack/stripmapStack/topo.py +++ b/contrib/stack/stripmapStack/topo.py @@ -6,7 +6,7 @@ import shelve import datetime import shutil import numpy as np -import gdal +from osgeo import gdal import isce import isceobj from isceobj.Constants import SPEED_OF_LIGHT diff --git a/contrib/stack/topsStack/MaskAndFilter.py b/contrib/stack/topsStack/MaskAndFilter.py index 253950f..0d329f0 100755 --- a/contrib/stack/topsStack/MaskAndFilter.py +++ b/contrib/stack/topsStack/MaskAndFilter.py @@ -9,8 +9,8 @@ import argparse import os import isce import isceobj -import gdal -from gdalconst import GA_ReadOnly +from osgeo import gdal +from osgeo.gdalconst import GA_ReadOnly from scipy import ndimage diff --git a/contrib/stack/topsStack/extractCommonValidRegion.py b/contrib/stack/topsStack/extractCommonValidRegion.py index 0c990d9..23bebe2 100755 --- a/contrib/stack/topsStack/extractCommonValidRegion.py +++ b/contrib/stack/topsStack/extractCommonValidRegion.py @@ -6,7 +6,7 @@ import os import argparse import glob import numpy as np -import gdal +from osgeo import gdal import isce import isceobj from isceobj.Sensor.TOPS import createTOPSSwathSLCProduct diff --git a/contrib/stack/topsStack/generateIgram.py b/contrib/stack/topsStack/generateIgram.py index c00448d..80917a2 100755 --- a/contrib/stack/topsStack/generateIgram.py +++ b/contrib/stack/topsStack/generateIgram.py @@ -13,7 +13,7 @@ import copy from isceobj.Sensor.TOPS import createTOPSSwathSLCProduct from mroipac.correlation.correlation import Correlation import s1a_isce_utils as ut -import gdal +from osgeo import gdal def createParser(): diff --git a/contrib/stack/topsStack/geocodeGdal.py b/contrib/stack/topsStack/geocodeGdal.py index 24b6b67..919369e 100755 --- a/contrib/stack/topsStack/geocodeGdal.py +++ b/contrib/stack/topsStack/geocodeGdal.py @@ -7,7 +7,7 @@ import argparse import isce import isceobj import os -import gdal +from osgeo import gdal import numpy as np import xml.etree.ElementTree as ET diff --git a/contrib/stack/topsStack/grossOffsets.py b/contrib/stack/topsStack/grossOffsets.py index d788a47..4d21da7 100755 --- a/contrib/stack/topsStack/grossOffsets.py +++ b/contrib/stack/topsStack/grossOffsets.py @@ -12,7 +12,7 @@ from iscesys.Component.ProductManager import ProductManager as PM import numpy as np from netCDF4 import Dataset #from mpl_toolkits.basemap import Basemap -import gdal +from osgeo import gdal from scipy.interpolate import interp2d, griddata diff --git a/contrib/stack/topsStack/prep4timeseries.py b/contrib/stack/topsStack/prep4timeseries.py index 35008f9..8780cc3 100755 --- a/contrib/stack/topsStack/prep4timeseries.py +++ b/contrib/stack/topsStack/prep4timeseries.py @@ -8,8 +8,8 @@ import os import glob import isce import isceobj -import gdal -from gdalconst import GA_ReadOnly +from osgeo import gdal +from osgeo.gdalconst import GA_ReadOnly import s1a_isce_utils as ut from isceobj.Planet.Planet import Planet diff --git a/contrib/stack/topsStack/rubberSheeting.py b/contrib/stack/topsStack/rubberSheeting.py index 067ac78..ac98fcb 100755 --- a/contrib/stack/topsStack/rubberSheeting.py +++ b/contrib/stack/topsStack/rubberSheeting.py @@ -11,9 +11,8 @@ import os import isce import isceobj import shelve -import gdal -import osr -from gdalconst import GA_ReadOnly +from osgeo import gdal, osr +from osgeo.gdalconst import GA_ReadOnly from scipy import ndimage diff --git a/contrib/stack/topsStack/saveKml.py b/contrib/stack/topsStack/saveKml.py index 022dbac..4d9d171 100755 --- a/contrib/stack/topsStack/saveKml.py +++ b/contrib/stack/topsStack/saveKml.py @@ -7,7 +7,7 @@ import argparse import isce import isceobj import os -import gdal +from osgeo import gdal import matplotlib as mpl; #mpl.use('Agg') import matplotlib.pyplot as plt from pykml.factory import KML_ElementMaker as KML diff --git a/contrib/stack/topsStack/unwrap.py b/contrib/stack/topsStack/unwrap.py index abc4dce..5d6fba8 100755 --- a/contrib/stack/topsStack/unwrap.py +++ b/contrib/stack/topsStack/unwrap.py @@ -38,7 +38,7 @@ from isceobj.Constants import SPEED_OF_LIGHT import argparse import os import pickle -import gdal +from osgeo import gdal import numpy as np #import shelve import s1a_isce_utils as ut diff --git a/contrib/timeseries/prepStackToStaMPS/bin/step_baseline_stack.py b/contrib/timeseries/prepStackToStaMPS/bin/step_baseline_stack.py index a9c6e16..fa4c923 100755 --- a/contrib/timeseries/prepStackToStaMPS/bin/step_baseline_stack.py +++ b/contrib/timeseries/prepStackToStaMPS/bin/step_baseline_stack.py @@ -56,7 +56,7 @@ def baselinegrid(inps): """ Basline files are given as grids """ - import gdal + from osgeo import gdal # parsing the command line inputs baseline_dir = inps.baseline_dir