[wwwsearch-commits] r18300 - wwwsearch/ClientForm/trunk

[jjlee at codespeak.net]

Author: jjlee
Date: Sun Oct  9 02:14:11 2005
New Revision: 18300

Removed:
   wwwsearch/ClientForm/trunk/MANIFEST.in
Modified:
   wwwsearch/ClientForm/trunk/   (props changed)
   wwwsearch/ClientForm/trunk/setup.py
Log:
Add support for setuptools / EasyInstall / Python Eggs

Deleted: /wwwsearch/ClientForm/trunk/MANIFEST.in
==============================================================================
--- /wwwsearch/ClientForm/trunk/MANIFEST.in	Sun Oct  9 02:14:11 2005
+++ (empty file)
@@ -1,10 +0,0 @@
-include MANIFEST.in
-include COPYING
-include INSTALL
-include GeneralFAQ.html
-include README.html.in
-include README.html
-include README.txt
-include ChangeLog
-include *.py
-recursive-include testdata *.html

Modified: wwwsearch/ClientForm/trunk/setup.py
==============================================================================
--- wwwsearch/ClientForm/trunk/setup.py	(original)
+++ wwwsearch/ClientForm/trunk/setup.py	Sun Oct  9 02:14:11 2005
@@ -14,6 +14,7 @@
 PACKAGE = False
 LICENSE = "BSD"
 PLATFORMS = ["any"]
+ZIP_SAFE = True
 CLASSIFIERS = """\
 Development Status :: 5 - Production/Stable
 Intended Audience :: Developers
@@ -41,47 +42,33 @@
 #-------------------------------------------------------
 # the rest is constant for most of my released packages:
 
-import sys, string
-from distutils.core import setup
+import ez_setup
+ez_setup.use_setuptools()
 
-_setup = setup
-def setup(**kwargs):
-    if not hasattr(sys, "version_info") or sys.version_info < (2, 3):
-        # Python version compatibility
-        # XXX probably download_url came in earlier than 2.3
-        for key in ["classifiers", "download_url"]:
-            if kwargs.has_key(key):
-                del kwargs[key]
-    # Only want packages keyword if this is a package,
-    # only want py_modules keyword if this is a single-file module,
-    # so get rid of packages or py_modules keyword as appropriate.
-    if kwargs["packages"] is None:
-        del kwargs["packages"]
-    else:
-        del kwargs["py_modules"]
-    apply(_setup, (), kwargs)
+import setuptools
 
 if PACKAGE:
-    packages = [NAME]
-    py_modules = None
+    packages, py_modules = [NAME], None
 else:
-    py_modules = [NAME]
-    packages = None
+    packages, py_modules = None, [NAME]
 
-doclines = string.split(__doc__, "\n")
+doclines = __doc__.split("\n")
 
-setup(name = NAME,
-      version = VERSION,
-      license = LICENSE,
-      platforms = PLATFORMS,
-      classifiers = filter(None, string.split(CLASSIFIERS, "\n")),
-      author = "John J. Lee",
-      author_email = "jjl at pobox.com",
-      description = doclines[0],
-      url = "http://wwwsearch.sourceforge.net/%s/" % NAME,
-      download_url = ("http://wwwsearch.sourceforge.net/%s/src/"
-                      "%s-%s.tar.gz" % (NAME, NAME, VERSION)),
-      long_description = string.join(doclines[2:], "\n"),
-      py_modules = py_modules,
-      packages = packages,
-      )
+setuptools.setup(
+    name = NAME,
+    version = VERSION,
+    license = LICENSE,
+    platforms = PLATFORMS,
+    classifiers = [c for c in CLASSIFIERS.split("\n") if c],
+    zip_safe = ZIP_SAFE,
+    test_suite = "test",
+    author = "John J. Lee",
+    author_email = "jjl at pobox.com",
+    description = doclines[0],
+    long_description = "\n".join(doclines[2:]),
+    url = "http://wwwsearch.sourceforge.net/%s/" % NAME,
+    download_url = ("http://wwwsearch.sourceforge.net/%s/src/"
+                    "%s-%s.tar.gz" % (NAME, NAME, VERSION)),
+    py_modules = py_modules,
+    packages = packages,
+    )