From fd982ff57a584b6a582efc83572ef1abcb504e13 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Thu, 20 Feb 2014 13:27:53 +0000 Subject: [PATCH] Update for latest Designate changes --- .../notification_handler/sample.py | 6 ++--- requirements.txt | 3 +-- setup.cfg | 4 +-- setup.py | 27 ++++++++++--------- test-requirements.txt | 9 ++----- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/designate_ext_samplehandler/notification_handler/sample.py b/designate_ext_samplehandler/notification_handler/sample.py index 6db8b4f..7f4c6e0 100644 --- a/designate_ext_samplehandler/notification_handler/sample.py +++ b/designate_ext_samplehandler/notification_handler/sample.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. from oslo.config import cfg -from moniker.openstack.common import log as logging -from moniker.notification_handler.base import Handler +from designate.openstack.common import log as logging +from designate.notification_handler.base import NotificationHandler LOG = logging.getLogger(__name__) @@ -34,7 +34,7 @@ ], group='handler:sample') -class SampleHandler(Handler): +class SampleHandler(NotificationHandler): """ Sample Handler """ __plugin_name__ = 'sample' diff --git a/requirements.txt b/requirements.txt index a9f0685..e3296ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5.10,<0.6 +pbr>=0.6,<1.0 -e git+https://github.com/stackforge/designate.git#egg=designate diff --git a/setup.cfg b/setup.cfg index 0b75935..fd27a60 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = designate-ext-samplehandler version = 2013.2 -summary = Sample Moniker Handler Extension +summary = Sample Designate Handler Extension description-file = README.rst author = Kiall Mac Innes @@ -27,7 +27,7 @@ packages = [entry_points] designate.notification_handler = - sample = moniker_ext_samplehandler.notification_handler.sample:SampleHandler + sample = designate_ext_samplehandler.notification_handler.sample:SampleHandler [build_sphinx] all_files = 1 diff --git a/setup.py b/setup.py index 7655099..70c2b3f 100755 --- a/setup.py +++ b/setup.py @@ -1,21 +1,22 @@ #!/usr/bin/env python -# Copyright 2013 Hewlett-Packard Development Company, L.P. +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # -# Author: Kiall Mac Innes +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools setuptools.setup( - setup_requires=['d2to1', 'pbr'], - d2to1=True) + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index b57e7c8..5c9111e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,9 +1,4 @@ -coverage>=3.6 flake8==2.0 -hacking>=0.5.3,<0.6 -mock>=0.8.0 +hacking>=0.8.0,<0.9 pep8==1.4.5 -pyflakes==0.7.2 -python-subunit -testrepository -unittest2 +pyflakes>=0.7.2,<0.7.4