[Pywebsvcs-checkins] SF.net SVN: pywebsvcs: [1179] trunk/zsi

[<bov...@us...>]

Revision: 1179
Author:   boverhof
Date:     2006-04-21 13:49:22 -0700 (Fri, 21 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/pywebsvcs/?rev=1179&view=rev

Log Message:
-----------
M    setup.py
M    README
M    CHANGES
	-If Python >= 2.4, build/install ZSI.twisted package
         else don't add to packages.

Modified Paths:
--------------
    trunk/zsi/CHANGES
    trunk/zsi/README
    trunk/zsi/setup.py
Modified: trunk/zsi/CHANGES
===================================================================
--- trunk/zsi/CHANGES	2006-04-21 17:49:03 UTC (rev 1178)
+++ trunk/zsi/CHANGES	2006-04-21 20:49:22 UTC (rev 1179)
@@ -1,4 +1,6 @@
 Change for xxx released xxx:
+    -   Added ZSI.twisted package w/client and server, requires Python 2.4
+    -   If Python >= 2.4, build/install ZSI.twisted package
     -   Make XMLSchema.py work in cases where threading isn't built in
     -   Add client-side Cookie Support (Jorgen Frojk Kjaersgaard)
     -   Add Typecode.typed to control xsi:type data system-wide

Modified: trunk/zsi/README
===================================================================
--- trunk/zsi/README	2006-04-21 17:49:03 UTC (rev 1178)
+++ trunk/zsi/README	2006-04-21 20:49:22 UTC (rev 1179)
@@ -14,8 +14,8 @@
 invocation methods are supported.  There are no known bugs.  It's only
 known limitation is that it cannot handle multi-dimensional arrays.
 
-ZSI is built on top of DOM.  It requires Python 2.0 or later, and PyXML
-0.6 or later.  It is open source.  We hope you find it useful.
+ZSI is built on top of DOM.  It requires Python 2.3 or later, and PyXML
+0.8.3 or later.  It is open source.  We hope you find it useful.
 
 The documentation (in PDF and HTML) is accurate.  We should probably
 restructure the document as a HOWTO.  You probably can't usefully edit

Modified: trunk/zsi/setup.py
===================================================================
--- trunk/zsi/setup.py	2006-04-21 17:49:03 UTC (rev 1178)
+++ trunk/zsi/setup.py	2006-04-21 20:49:22 UTC (rev 1179)
@@ -1,8 +1,6 @@
 #! /usr/bin/env python
 # $Header$
 import sys
-from distutils.command.build import build as _build
-from distutils.command.build_py import build_py as _build_py
 try:
     from setuptools import setup
 except ImportError:
@@ -30,46 +28,15 @@
     print 'ZSI/version.py not found; run "make"'
     sys.exit(1)
 
-_twisted_packages = ['ZSI.twisted']
-_twisted_options = [('twisted', None, 'build twisted packages')]
+_packages = [ "ZSI", "ZSI.generate", "ZSI.wstools"]
+if sys.version_info[0:2] >= (2, 4):
+    _packages.append("ZSI.twisted")
 
-class build_py(_build_py):
-    user_options = _build_py.user_options[:]
-    user_options += _twisted_options
-    boolean_options = _build.boolean_options[:]
-    boolean_options.append(_twisted_options[0][0])
-
-    def initialize_options(self):
-        _build_py.initialize_options(self)
-        self.twisted = False
-
-    def run(self):
-        if self.twisted:
-            self.distribution.packages += _twisted_packages
-        return _build_py.run(self)
-
-
-class build(_build):
-    user_options = _build.user_options[:]
-    user_options += _twisted_options
-    boolean_options = _build.boolean_options[:]
-    boolean_options.append(_twisted_options[0][0])
-
-    def initialize_options(self):
-        _build.initialize_options(self)
-        self.twisted = False
-
-    def run(self):
-        if self.twisted:
-            self.distribution.packages += _twisted_packages
-        return _build.run(self)
-
-
 setup(
     name="ZSI",
     version=_version,
     license="Python",
-    packages=[ "ZSI", "ZSI.generate", "ZSI.wstools"],
+    packages=_packages,
     scripts=["scripts/wsdl2py.py", "scripts/wsdl2dispatch.py"],
     description="Zolera SOAP Infrastructure",
     author="Rich Salz, et al",
@@ -77,6 +44,5 @@
     maintainer="Rich Salz, et al",
     maintainer_email="pyw...@li...",
     url=_url,
-    long_description='For additional information, please see ' + _url,
-    cmdclass={'build':build, 'build_py':build_py},
+    long_description="For additional information, please see " + _url,
 )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.