Refactored to use all the setuptools features

1 files changed, 14 insertions, 62 deletions

diff --git a/setup.py b/setup.py
index 957d915..db43bc1 100644
--- a/setup.py
+++ b/setup.py
@@ -8,56 +8,11 @@ import os
 
 from ez_setup import use_setuptools
 use_setuptools()
-from setuptools import setup
-
-BASEDIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'paste')
-
-def get_data_files(relpath, files=None):
-    if files is None:
-        files = []
-    for name in os.listdir(os.path.join(BASEDIR, relpath)):
-        if name.startswith("."):
-            continue
-        fn = os.path.join(relpath, name)
-        if os.path.isdir(os.path.join(BASEDIR, fn)):
-            get_data_files(fn, files)
-        elif os.path.isfile(os.path.join(BASEDIR, fn)):
-            files.append(fn)
-    return files
-
-package_data = []
-for subdir in [('app_templates',),
-               ('frameworks',)]:
-    package_data.extend(get_data_files(os.path.join(*subdir)))
-for filename in [('default_config.conf',)]:
-    package_data.append(os.path.join(*filename))
-
-def get_svn_revision():
-    """
-    Returns the newest svn revision for all files in the this
-    directory.
-    """
-    import commands
-    status, output = commands.getstatusoutput(
-        'svn ls -v %s' % os.path.dirname(__file__))
-    if status:
-        return 'unknown'
-    max_revision = 0
-    for line in output.splitlines():
-        line = line.strip()
-        if not line:
-            continue
-        revision = int(line.split()[0])
-        max_revision = max(max_revision, revision)
-    return max_revision
-
-if not RELEASE:
-    rev = get_svn_revision()
-    __version__ += '-devel-r%s' % rev
+from setuptools import setup, find_packages
 
 setup(name="Paste",
       version=__version__,
-      description="Tools for use with a Web Server Gateway Interface stack",
+      description="Tools for using a Web Server Gateway Interface stack",
       long_description="""\
 These provide several pieces of "middleware" that can be nested to build
 web applications.  Each piece of middleware uses the WSGI (`PEP 333`_)
@@ -79,26 +34,23 @@ functionality.
                    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
                    "Topic :: Software Development :: Libraries :: Python Modules",
                    ],
+      keywords='web wsgi application server webware wareweb',
       author="Ian Bicking",
       author_email="ianb@colorstudy.com",
-      url="http://webwareforpython.org",
+      url="http://pythonpaste.org",
       license="PSF",
-      packages=["paste", "paste.exceptions",
-                "paste.util",
-                "paste.webkit",
-                "paste.webkit.FakeWebware",
-                "paste.webkit.FakeWebware.WebKit",
-                "paste.webkit.FakeWebware.WebUtils",
-                "paste.webkit.FakeWebware.MiscUtils",
-                "paste.webkit.FakeWebware.TaskKit",
-                "paste.servers",
-                "paste.servers.scgi_server",
-                "paste.wareweb",
-                "paste.docsupport",
-                ],
+      packages=find_packages(exclude=['ez_setup', 'examples', 'packages']),
       scripts=['scripts/paster'],
       download_url="",
-      package_data={'paste': package_data},
+      package_data={'': ['*.txt', '*.html', '*.conf'],
+                    'paste.app_templates': ['*.*_tmpl'],
+                    },
+      zip_safe=False,
+      extras_require={'Examples': ['SQLObject', 'ZopePageTemplates', 'Component',
+                                   'ZPTKit', 'SQLObject', 'pysqlite'],
+                      'HTTP': ['WSGI_Utils'],
+                      'SCGI': ['flup'],
+                      }
       )
 
 # Send announce to: