From e0d076b7a77e6db65af370c4e02b84c99374f648 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 15 Feb 2013 00:14:39 +0100 Subject: [PATCH] Changed setup.py to support the test command. You can now run tests via python setup.py test Defined test suite in piwikapi/tests/__init__.py --- piwikapi/tests/__init__.py | 27 +++++++++++++++++++++++++++ setup.py | 29 ++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/piwikapi/tests/__init__.py b/piwikapi/tests/__init__.py index e69de29..d9ecae4 100644 --- a/piwikapi/tests/__init__.py +++ b/piwikapi/tests/__init__.py @@ -0,0 +1,27 @@ +import unittest +import doctest +import sys + + + +def all_tests_suite(): + suite = unittest.TestLoader().loadTestsFromNames([ + 'piwikapi.tests.analytics', + 'piwikapi.tests.ecommerce', + 'piwikapi.tests.goals', + 'piwikapi.tests.request', + 'piwikapi.tests.tracking', + ]) + return suite + +def main(): + runner = unittest.TextTestRunner(verbosity=1 + sys.argv.count('-v')) + suite = all_tests_suite() + raise SystemExit(not runner.run(suite).wasSuccessful()) + + +if __name__ == '__main__': + import os + import sys + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) + main() diff --git a/setup.py b/setup.py index 57ff09c..fe85aae 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,28 @@ except ImportError: from distutils.core import setup +from distutils.core import Extension, Command + + +class TestCommand(Command): + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + import sys, subprocess + raise SystemExit( + subprocess.call([sys.executable, + # Turn on deprecation warnings + '-Wd', + 'piwikapi/tests/__init__.py'])) + +cmdclass = dict(test=TestCommand) +kw = dict(cmdclass=cmdclass) setup( name = "piwikapi", version = "0.2.2", @@ -12,8 +34,8 @@ long_description = open("README.rst").read(), license = "BSD", url = "http://github.com/nkuttler/python-piwikapi", - packages = ['piwikapi'], - include_package_data = True, + packages = ['piwikapi', 'piwikapi.tests'], +# include_package_data = True, classifiers = [ "Development Status :: 4 - Beta", "Environment :: Web Environment", @@ -22,5 +44,6 @@ "Operating System :: OS Independent", "Programming Language :: Python", ], - zip_safe = True, + **kw +# zip_safe = True, )