[py-svn] r63234 - in py: build trunk

[hpk at codespeak.net]

Author: hpk
Date: Mon Mar 23 16:17:49 2009
New Revision: 63234

Modified:
   py/build/gensetup.py
   py/trunk/setup.py
Log:
fix gensetup, regen setup


Modified: py/build/gensetup.py
==============================================================================
--- py/build/gensetup.py	(original)
+++ py/build/gensetup.py	Mon Mar 23 16:17:49 2009
@@ -14,7 +14,7 @@
     return " ".join(text.split())
 
 class SetupWriter(object):
-    EXCLUDES = ("MANIFEST.in",)
+    EXCLUDES = ("MANIFEST.in", "contrib")
 
     def __init__(self, wcbasedir, pkg, setuptools=False):
         self.wcbasedir = wcbasedir
@@ -182,9 +182,16 @@
     def getpackages(self):
         packages = []
         for p in self.allpaths:
+            if p.basename == "py":
+                continue
             if p.check(dir=1) and p.join('__init__.py').check():
                 modpath = p.relto(self.wcbasedir).replace(p.sep, '.')
-                packages.append(modpath)
+                for exclude in self.EXCLUDES:
+                    if modpath.startswith(exclude):
+                        print "EXCLUDING", modpath
+                        break
+                else:
+                    packages.append(modpath)
         return packages
 
     def getpackagedata(self):
@@ -270,8 +277,13 @@
             if p.check(dir=1):
                 continue
             toadd = p.relto(self.wcbasedir)
-            if toadd and toadd not in self.EXCLUDES:
-                lines.append("%s" %(toadd))
+            if toadd:
+                for exclude in self.EXCLUDES:
+                    if toadd.startswith(exclude):
+                        break
+                    assert toadd.find(exclude) == -1, (toadd, exclude)
+                else:
+                    lines.append("%s" %(toadd))
         targetfile = self.basedir.join("MANIFEST")
         targetfile.write("\n".join(lines))
         print "wrote",  targetfile

Modified: py/trunk/setup.py
==============================================================================
--- py/trunk/setup.py	(original)
+++ py/trunk/setup.py	Mon Mar 23 16:17:49 2009
@@ -1,7 +1,7 @@
 """
     setup file for 'py' package based on:
 
-        https://codespeak.net/svn/py/trunk, revision=63221
+        https://codespeak.net/svn/py/trunk, revision=63230
 
     autogenerated by gensetup.py
 """
@@ -67,12 +67,7 @@
                      'Topic :: System :: Distributed Computing',
                      'Topic :: Utilities',
                      'Programming Language :: Python'],
-        packages=['contrib.pygreen',
-                  'contrib.pygreen.pipe',
-                  'contrib.pygreen.server',
-                  'contrib.pygreen.test',
-                  'py',
-                  'py.builtin',
+        packages=['py.builtin',
                   'py.builtin.testing',
                   'py.c-extension',
                   'py.cmdline',