From 38101069661a1e4d509c5394eb140ac2a8dbbd92 Mon Sep 17 00:00:00 2001
From: Bruce Flynn <brucef@ssec.wisc.edu>
Date: Sat, 18 Aug 2012 02:32:54 +0000
Subject: [PATCH] remove pydap dependency
---
metobs/data/__init__.py | 5 ++++-
setup.py | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/metobs/data/__init__.py b/metobs/data/__init__.py
index bf8a2f4..2138968 100644
--- a/metobs/data/__init__.py
+++ b/metobs/data/__init__.py
@@ -11,7 +11,10 @@ from datetime import timedelta
import fpconst
from numpy import array, average, zeros, radians, degrees, arctan2, sin, cos, ndarray, log, minimum, exp, sqrt
from numpy.ma import masked_array, average as masked_average, MaskedArray, masked_where, column_stack
-from pydap.client import open_url as dapopen
+try:
+ from pydap.client import open_url as dapopen
+except ImportError:
+ dapopen = open
from metobs import mytime
diff --git a/setup.py b/setup.py
index 4583e5d..4a58d53 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ version = '0.3'
filelist = [x for x in glob('metobs/**/*') if 'CVS' not in x]
-_requires = ['metobs.mytime', 'fpconst>=0.7.2', 'pydap']
+_requires = ['metobs.mytime', 'fpconst>=0.7.2']
setup(name='metobs.data',
version=version,
@@ -29,4 +29,4 @@ setup(name='metobs.data',
zip_safe=False,
install_requires=_requires,
dependency_links = ['http://larch.ssec.wisc.edu/cgi-bin/repos.cgi']
-)
\ No newline at end of file
+)
--
GitLab