Commit 9e139c09 authored by Niklas Bohn's avatar Niklas Bohn
Browse files

Merge branch 'enhancement/replace_deprecated_imports' into 'master'

Replaced deprecated gdal imports to fix "DeprecationWarning: gdal.py was...

See merge request !81
parents ae847a01 73bc9f3e
......@@ -8,6 +8,8 @@ History
New features:
* 'make lint' now directly prints errors instead of only logging them to logfiles.
* Replaced deprecated gdal imports to fix
"DeprecationWarning: gdal.py was placed in a namespace, it is now available as osgeo.gdal".
Bugfixes:
* Pinned gdal to version<=3.1.2 to avoid import error.
......
import os
from os.path import dirname, isfile, splitext, join
import numpy as np
import gdal
from osgeo import gdal
from gdalconst import GA_ReadOnly
import logging
import inspect
......
......@@ -12,7 +12,7 @@ from time import time
from uuid import uuid1
from xml.etree.ElementTree import QName
import xml.etree.ElementTree
import gdal
from osgeo import gdal
import glymur
import iso8601
import matplotlib.pyplot as plt
......
......@@ -11,7 +11,7 @@ from time import sleep, time
from types import MethodType
from types import SimpleNamespace
from xml.dom.minidom import parseString
import gdal
from osgeo import gdal
import mpld3
import PIL
import numpy as np
......
......@@ -35,7 +35,7 @@ from numbers import Number
import matplotlib
import matplotlib.pyplot as plt
import numpy as np
import gdal
from osgeo import gdal
from .AC.RtFo import Rho2Rj_const, Rj2RhoJ_const, RtFo
from .AC.ACG import instrument_subset
......
......@@ -27,7 +27,7 @@ import matplotlib.pyplot as plt
import h5py
from datetime import datetime
import subprocess
import gdal
from osgeo import gdal
from sicor import tables
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment