From aa87680fe947593c1652e050a635afaf698a9ace Mon Sep 17 00:00:00 2001
From: Jay <jlaura@usgs.gov>
Date: Mon, 25 Mar 2019 22:23:35 -0700
Subject: [PATCH] Updates how conditional gdal is imported
---
plio/io/__init__.py | 4 ++--
setup.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plio/io/__init__.py b/plio/io/__init__.py
index f7acda9..d44b96d 100644
--- a/plio/io/__init__.py
+++ b/plio/io/__init__.py
@@ -3,7 +3,7 @@ import importlib
import warnings
import sys
-if 'osgeo' in sys.modules:
+try:
gdal = importlib.util.find_spec('gdal')
ogr = importlib.util.find_spec('osgeo.ogr')
osr = importlib.util.find_spec('osr')
@@ -12,7 +12,7 @@ if 'osgeo' in sys.modules:
ogr = ogr.loader.load_module()
osr = osr.loader.load_module()
gdal.UseExceptions()
-else:
+except:
gdal = None
ogr = None
osr = None
diff --git a/setup.py b/setup.py
index 35b5e76..a5899f2 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ with open('README.md', 'r') as f:
def setup_package():
setup(
name = "plio",
- version = '1.0.0',
+ version = '1.1.0',
author = "Jay Laura",
author_email = "jlaura@usgs.gov",
description = ("I/O API to support planetary data formats."),
--
GitLab