From 7872e280a95039549be9f87b1962ba65f8bae335 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 8 Aug 2012 10:37:26 -0700 Subject: [PATCH] Fix versioning depending on nose. Previously versioning depended on nose which broke setup.py if nose was not already installed. Break version into its own module so that it is not dependent on nose. --- htmloutput/htmloutput.py | 3 ++- htmloutput/version.py | 1 + setup.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 htmloutput/version.py diff --git a/htmloutput/htmloutput.py b/htmloutput/htmloutput.py index 6506263..581ef69 100644 --- a/htmloutput/htmloutput.py +++ b/htmloutput/htmloutput.py @@ -42,7 +42,8 @@ import traceback from nose.plugins import Plugin from xml.sax import saxutils -__version__ = "0.0.1" +import version +__version__ = version.__version__ class TemplateData(object): """ diff --git a/htmloutput/version.py b/htmloutput/version.py new file mode 100644 index 0000000..b8023d8 --- /dev/null +++ b/htmloutput/version.py @@ -0,0 +1 @@ +__version__ = '0.0.1' diff --git a/setup.py b/setup.py index 78256a7..04d5c46 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,9 @@ -import htmloutput.htmloutput +import htmloutput.version import setuptools setuptools.setup( name="nosehtmloutput", - version=htmloutput.htmloutput.__version__, + version=htmloutput.version.__version__, author='Hewlett-Packard Development Company, L.P.', description="Nose plugin to produce test results in html.", license="Apache License, Version 2.0",