[py-svn] r63241 - in py: build trunk trunk/py

[hpk at codespeak.net]

Author: hpk
Date: Mon Mar 23 17:03:10 2009
New Revision: 63241

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


Modified: py/build/gensetup.py
==============================================================================
--- py/build/gensetup.py	(original)
+++ py/build/gensetup.py	Mon Mar 23 17:03:10 2009
@@ -182,8 +182,8 @@
     def getpackages(self):
         packages = []
         for p in self.allpaths:
-            if p.basename == "py":
-                continue
+            #if p.basename == "py":
+            #    continue
             if p.check(dir=1) and p.join('__init__.py').check():
                 modpath = p.relto(self.wcbasedir).replace(p.sep, '.')
                 for exclude in self.EXCLUDES:
@@ -201,7 +201,9 @@
             if p.check(file=1) and (not p.dirpath("__init__.py").check() 
                or p.ext != ".py"):
                 if p.dirpath() != self.wcbasedir:
-                    datafiles.append(p.relto(pkgbase))
+                    x = p.relto(pkgbase)
+                    if x:
+                        datafiles.append(p.relto(pkgbase))
         return {'py': datafiles}
 
     def getdatafiles(self):

Modified: py/trunk/MANIFEST
==============================================================================
--- py/trunk/MANIFEST	(original)
+++ py/trunk/MANIFEST	Mon Mar 23 17:03:10 2009
@@ -204,7 +204,6 @@
 py/misc/cache.py
 py/misc/cmdline/__init__.py
 py/misc/cmdline/countloc.py
-py/misc/conftest-socketgatewayrun.py
 py/misc/difftime.py
 py/misc/dynpkg.py
 py/misc/error.py

Modified: py/trunk/py/__init__.py
==============================================================================
--- py/trunk/py/__init__.py	(original)
+++ py/trunk/py/__init__.py	Mon Mar 23 17:03:10 2009
@@ -23,7 +23,7 @@
 """
 from initpkg import initpkg
 
-version = "1.0.0a5"
+version = "1.0.0a6"
 
 initpkg(__name__,
     description = "pylib and py.test: agile development and test support library",

Modified: py/trunk/setup.py
==============================================================================
--- py/trunk/setup.py	(original)
+++ py/trunk/setup.py	Mon Mar 23 17:03:10 2009
@@ -1,7 +1,7 @@
 """
     setup file for 'py' package based on:
 
-        https://codespeak.net/svn/py/trunk, revision=63237
+        https://codespeak.net/svn/py/trunk, revision=63240
 
     autogenerated by gensetup.py
 """
@@ -39,9 +39,9 @@
         name='py',
         description='pylib and py.test: agile development and test support library',
         long_description = long_description, 
-        version='1.0.0a5', 
+        version='1.0.0a6', 
         url='http://pylib.org', 
-        download_url='http://codespeak.net/py/1.0.0a5/download.html', 
+        download_url='http://codespeak.net/py/1.0.0a6/download.html', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 
         author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
@@ -67,7 +67,8 @@
                      'Topic :: System :: Distributed Computing',
                      'Topic :: Utilities',
                      'Programming Language :: Python'],
-        packages=['py.builtin',
+        packages=['py',
+                  'py.builtin',
                   'py.builtin.testing',
                   'py.c-extension',
                   'py.cmdline',
@@ -115,14 +116,7 @@
                   'py.tool.testing',
                   'py.xmlobj',
                   'py.xmlobj.testing'],
-        package_data={'py': ['',
-                             '',
-                             '',
-                             '',
-                             '',
-                             '',
-                             '',
-                             'LICENSE',
+        package_data={'py': ['LICENSE',
                              'bin/_findpy.py',
                              'bin/_genscripts.py',
                              'bin/gendoc.py',