From d7b3ded8135bf745e536ac9ace94ed0d17ce335b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20K=C3=B6lker?= Date: Fri, 4 Nov 2011 20:26:04 -0500 Subject: [PATCH] thow it in the openstack namespace --- MANIFEST.in | 2 -- novanose.py | 0 openstack/__init__.py | 24 ++++++++++++++++++++++++ openstack/nose.py | 12 ++++++++++++ setup.py | 14 +++++++------- 5 files changed, 43 insertions(+), 9 deletions(-) delete mode 100644 novanose.py create mode 100644 openstack/__init__.py create mode 100644 openstack/nose.py diff --git a/MANIFEST.in b/MANIFEST.in index 3e5e382..9561fb1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1 @@ include README.rst -include setup.py -include novanose.py diff --git a/novanose.py b/novanose.py deleted file mode 100644 index e69de29..0000000 diff --git a/openstack/__init__.py b/openstack/__init__.py new file mode 100644 index 0000000..7753138 --- /dev/null +++ b/openstack/__init__.py @@ -0,0 +1,24 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# All Rights Reserved. +# +# 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 +# +# 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. + +# This ensures the openstack namespace is defined +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/openstack/nose.py b/openstack/nose.py new file mode 100644 index 0000000..7cec5f7 --- /dev/null +++ b/openstack/nose.py @@ -0,0 +1,12 @@ +""" +Openstack run_tests.py style output for nosetests +""" + +import logging + +from nose import plugins + +class Openstack(plugins.Plugin): + """Nova style output generator""" + + name = "openstack" diff --git a/setup.py b/setup.py index 684eb81..176a502 100644 --- a/setup.py +++ b/setup.py @@ -1,24 +1,24 @@ -from setuptools import setup +from setuptools import setup, find_packages version = "0.1" -setup(name="novanose", +setup(name="openstack.nose", version=version, - description="nova run_tests.py style output for nosetests", + description="openstack run_tests.py style output for nosetests", long_description=open("README.rst").read(), classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers keywords="nose", author="Jason K\xc3\xb6lker", author_email="jason@koelker.net", - url="https://github.com/jkoelker/novanose", - license="Apache License", - py_modules=["novanose"], + url="https://github.com/jkoelker/openstack-nose", + license="Apache Software License", + packages=find_packages(exclude=["ez_setup", "examples", "tests"]), install_requires=[ "nose", ], entry_points=""" # -*- Entry points: -*- [nose.plugins.0.10] -novanose = novanose:NovaNose +openstack.nose = openstack.nose:NovaNose """, )