From 18e1add3c8d316377651fdf1277d22ef36bc0c17 Mon Sep 17 00:00:00 2001 From: Jim Rybarski Date: Sun, 20 Dec 2015 10:12:02 -0600 Subject: [PATCH] revert versions to the way they were since it broke publishing, added unit test to ensure they're in sync --- setup.py | 7 ++++--- tests/version.py | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index a57fae6..7eb3249 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,6 @@ from setuptools import setup -from nd2reader import __version__ + +VERSION = '2.0.0' if __name__ == '__main__': setup( @@ -10,12 +11,12 @@ if __name__ == '__main__': 'six>=1.4, <2.0', 'xmltodict>=0.9.2, <1.0' ], - version=__version__, + version=VERSION, description='A tool for reading ND2 files produced by NIS Elements', author='Jim Rybarski', author_email='jim@rybarski.com', url='https://github.com/jimrybarski/nd2reader', - download_url='https://github.com/jimrybarski/nd2reader/tarball/%s' % __version__, + download_url='https://github.com/jimrybarski/nd2reader/tarball/%s' % VERSION, keywords=['nd2', 'nikon', 'microscopy', 'NIS Elements'], classifiers=['Development Status :: 5 - Production/Stable', 'Intended Audience :: Science/Research', diff --git a/tests/version.py b/tests/version.py index 3c86cdb..9d26e37 100644 --- a/tests/version.py +++ b/tests/version.py @@ -1,8 +1,12 @@ import nd2reader import unittest +from setup import VERSION class VersionTests(unittest.TestCase): - def test_versions_in_sync(self): + def test_module_version_type(self): # just make sure the version number exists and is the type we expect self.assertEqual(type(nd2reader.__version__), str) + + def test_versions_in_sync(self): + self.assertEqual(nd2reader.__version__, VERSION)