Add simple test autodiscovery

edschofield · edschofield · commit 7f67d562035d · 2013-07-22T16:53:45.000+10:00
diff --git a/discover_tests.py b/discover_tests.py
@@ -0,0 +1,13 @@
+"""
+Simple auto test discovery.
+
+From http://stackoverflow.com/a/17004409
+"""
+import os
+import sys
+import unittest
+
+def additional_tests():
+    setup_file = sys.modules['__main__'].__file__
+    setup_dir = os.path.abspath(os.path.dirname(setup_file))
+    return unittest.defaultTestLoader.discover(setup_dir)
diff --git a/setup.py b/setup.py
@@ -1,13 +1,23 @@
+#!/usr/bin/env python
 
+import os
 import sys
-setup_kwds = {}
-
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 import future
 
+
+if sys.argv[-1] == 'publish':
+    os.system('python setup.py sdist upload')
+    sys.exit()
+
 NAME = "future"
 PACKAGES = ["future", "future.features", "future.tests"]
+PACKAGE_DATA = {'': ['README.rst', 'LICENSE']}
+REQUIRES = []
 VERSION = future.__version__
 DESCRIPTION = "[experimental] support Python 2 with fewer warts"
 LONG_DESC = future.__doc__
@@ -18,14 +28,17 @@
 KEYWORDS = "future python3 migration backport"
 CLASSIFIERS = [
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.3",
     "License :: OSI Approved",
     "License :: OSI Approved :: MIT License",
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
 ]
 
+setup_kwds = {}
+
 setup(name=NAME,
       version=VERSION,
       author=AUTHOR,
@@ -36,7 +49,11 @@
       license=LICENSE,
       keywords=KEYWORDS,
       packages=PACKAGES,
+      package_data=PACKAGE_DATA,
+      include_package_data=True,
+      install_requires=REQUIRES,
       classifiers=CLASSIFIERS,
+      test_suite = "discover_tests",
       **setup_kwds
      )
 
