Commit d83ebc60 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Replaced deprecated osgeo imports. Bumped version.


Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 937d8d11
Pipeline #15177 passed with stages
in 2 minutes and 25 seconds
...@@ -28,10 +28,7 @@ from copy import copy ...@@ -28,10 +28,7 @@ from copy import copy
from typing import Iterable, Union, Tuple # noqa F401 from typing import Iterable, Union, Tuple # noqa F401
# custom # custom
try: from osgeo import gdal
import gdal
except ImportError:
from osgeo import gdal
import numpy as np import numpy as np
try: try:
......
...@@ -28,10 +28,7 @@ from six import PY2 ...@@ -28,10 +28,7 @@ from six import PY2
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
# custom # custom
try: from osgeo import gdal
import gdal
except ImportError:
from osgeo import gdal
try: try:
import pyfftw import pyfftw
except ImportError: except ImportError:
......
...@@ -28,10 +28,7 @@ import warnings ...@@ -28,10 +28,7 @@ import warnings
import time import time
# custom # custom
try: from osgeo import gdal
import gdal
except ImportError:
from osgeo import gdal
import numpy as np import numpy as np
from geopandas import GeoDataFrame from geopandas import GeoDataFrame
from pandas import DataFrame, Series from pandas import DataFrame, Series
......
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '1.1.0' __version__ = '1.1.1'
__versionalias__ = '2020-10-30_01' __versionalias__ = '2020-11-02_01'
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