[py-svn] r57410 - in py/release/0.9.x: . py

[hpk at codespeak.net]

Author: hpk
Date: Mon Aug 18 13:50:09 2008
New Revision: 57410

Modified:
   py/release/0.9.x/CHANGELOG
   py/release/0.9.x/py/__init__.py
   py/release/0.9.x/py/initpkg.py
   py/release/0.9.x/setup.py
Log:
another version, added py.__version__ attribute


Modified: py/release/0.9.x/CHANGELOG
==============================================================================
--- py/release/0.9.x/CHANGELOG	(original)
+++ py/release/0.9.x/CHANGELOG	Mon Aug 18 13:50:09 2008
@@ -11,7 +11,7 @@
   windows environments, they are now added to the 
   Scripts directory as ".cmd" files. 
 
-* improving stability for py.execnet on windows 
+* improving stability of py.execnet on windows 
 
 * py.test's traceback is better parseable from editors 
   (follows the filenames:LINENO: MSG convention)
@@ -22,6 +22,8 @@
 * removed previously accidentally added 
   py.test.broken and py.test.notimplemented helpers. 
 
+* there now is a py.__version__ attribute
+
 Changes between 0.9.0 and 0.9.1
 ===============================
 

Modified: py/release/0.9.x/py/__init__.py
==============================================================================
--- py/release/0.9.x/py/__init__.py	(original)
+++ py/release/0.9.x/py/__init__.py	Mon Aug 18 13:50:09 2008
@@ -7,7 +7,7 @@
 """
 from initpkg import initpkg
 
-version = "0.9.2-alpha-4"
+version = "0.9.2-alpha-5"
 
 initpkg(__name__,
     description = "py lib: agile development and test support library",

Modified: py/release/0.9.x/py/initpkg.py
==============================================================================
--- py/release/0.9.x/py/initpkg.py	(original)
+++ py/release/0.9.x/py/initpkg.py	Mon Aug 18 13:50:09 2008
@@ -32,7 +32,7 @@
 # ---------------------------------------------------
 
 class Package(object):
-    def __init__(self, name, exportdefs):
+    def __init__(self, name, exportdefs, metainfo):
         pkgmodule = sys.modules[name]
         assert pkgmodule.__name__ == name
         self.name = name
@@ -54,6 +54,13 @@
         # inhibit further direct filesystem imports through the package module
         del pkgmodule.__path__
 
+        # set metainfo 
+        for name, value in metainfo.items(): 
+            setattr(self, name, value) 
+        version = metainfo.get('version', None)
+        if version:
+            pkgmodule.__version__ = version
+
     def _resolve(self, extpyish):
         """ resolve a combined filesystem/python extpy-ish path. """
         fspath, modpath = extpyish
@@ -229,9 +236,7 @@
 def initpkg(pkgname, exportdefs, **kw):
     #print "initializing package", pkgname
     # bootstrap Package object
-    pkg = Package(pkgname, exportdefs)
-    for name, value in kw.items(): 
-        setattr(pkg, name, value) 
+    pkg = Package(pkgname, exportdefs, kw)
     seen = { pkgname : pkg.module }
     deferred_imports = []
 

Modified: py/release/0.9.x/setup.py
==============================================================================
--- py/release/0.9.x/setup.py	(original)
+++ py/release/0.9.x/setup.py	Mon Aug 18 13:50:09 2008
@@ -18,7 +18,7 @@
     setup(cmdclass=cmdclass,
         name='py',
         description='py lib: agile development and test support library',
-        version='0.9.2-alpha-4', 
+        version='0.9.2-alpha-5', 
         url='http://pylib.org', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],