From 13b806900e98c5d2980947c17630085242ff6112 Mon Sep 17 00:00:00 2001
From: Bruce Flynn <brucef@ssec.wisc.edu>
Date: Mon, 23 Jun 2014 10:45:34 -0500
Subject: [PATCH] Use interface for model from MetObsCommon
---
aosstower/model.py | 4 +++-
setup.py | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/aosstower/model.py b/aosstower/model.py
index b0a665d..6224354 100644
--- a/aosstower/model.py
+++ b/aosstower/model.py
@@ -5,9 +5,10 @@ from datetime import datetime, timedelta
import rrdtool
import numpy as np
+from zope.interface import implementer
from metobs.data import wind_vector_degrees, to_unix_timestamp
-from aosstower import meta
+from metobscommon import interface
class ModelError(Exception):
@@ -76,6 +77,7 @@ def initialize(filepath, start=None, days=365, data_interval=5):
@WrapErrors(rrdtool.error)
+@implementer(interface.Model)
class RrdModel(object):
"""Model for storing the Level0 uncalibrated data for non-scientific
purposes, such as web-widgets.
diff --git a/setup.py b/setup.py
index 4234a0f..970b1d5 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,8 @@ setup(
install_requires=[
'python-rrdtool',
'numpy',
- 'metobs.data>=0.4a'
+ 'metobs.data>=0.4a',
+ 'MetObsCommon>=0.1dev'
],
dependency_links=['http://larch.ssec.wisc.edu/cgi-bin/repos.cgi'],
packages=find_packages(exclude=['aosstower.tests']),
--
GitLab