[Checkins] SVN: zope.kgs/trunk/ - Add ability to specify the extra-includes for running tests.

[Stephan Richter]

Log message for revision 102252:
  - Add ability to specify the extra-includes for running tests.
  
  - Get ready for release.
  

Changed:
  U   zope.kgs/trunk/CHANGES.txt
  U   zope.kgs/trunk/setup.py
  U   zope.kgs/trunk/src/zope/kgs/README.txt
  U   zope.kgs/trunk/src/zope/kgs/buildout.py
  U   zope.kgs/trunk/src/zope/kgs/kgs.py

-=-
Modified: zope.kgs/trunk/CHANGES.txt
===================================================================
--- zope.kgs/trunk/CHANGES.txt	2009-07-24 15:17:48 UTC (rev 102251)
+++ zope.kgs/trunk/CHANGES.txt	2009-07-24 15:48:32 UTC (rev 102252)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+1.2.0 (2009-07-24)
+------------------
+
+- Add ability to specify the extra-includes for running tests.
+
 1.1.0 (2009-02-01)
 ------------------
 

Modified: zope.kgs/trunk/setup.py
===================================================================
--- zope.kgs/trunk/setup.py	2009-07-24 15:17:48 UTC (rev 102251)
+++ zope.kgs/trunk/setup.py	2009-07-24 15:48:32 UTC (rev 102252)
@@ -19,7 +19,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.kgs',
-      version = '1.1.0',
+      version = '1.2.0',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='Known-Good-Set (KGS) Support',

Modified: zope.kgs/trunk/src/zope/kgs/README.txt
===================================================================
--- zope.kgs/trunk/src/zope/kgs/README.txt	2009-07-24 15:17:48 UTC (rev 102251)
+++ zope.kgs/trunk/src/zope/kgs/README.txt	2009-07-24 15:48:32 UTC (rev 102252)
@@ -33,6 +33,7 @@
   ...
   ... [packageB]
   ... versions = 1.2.3
+  ... test-extras = test
   ...
   ... [packageC]
   ... # Do not test this package.
@@ -164,7 +165,7 @@
   [test]
   recipe = zc.recipe.testrunner
   eggs = packageA
-      packageB
+      packageB [test]
   <BLANKLINE>
   [versions]
   packageA = 1.0.1
@@ -186,7 +187,7 @@
   [test]
   recipe = zc.recipe.testrunner
   eggs = packageA
-      packageB
+      packageB [test]
       packageD
   <BLANKLINE>
   [versions]

Modified: zope.kgs/trunk/src/zope/kgs/buildout.py
===================================================================
--- zope.kgs/trunk/src/zope/kgs/buildout.py	2009-07-24 15:17:48 UTC (rev 102251)
+++ zope.kgs/trunk/src/zope/kgs/buildout.py	2009-07-24 15:48:32 UTC (rev 102252)
@@ -38,6 +38,12 @@
          for package in packages])
 
 
+def getPackageSpec(package):
+    spec = package.name
+    if package.testExtras:
+        spec += ' ['+ package.testExtras + ']'
+    return spec
+
 def generateBuildout(packageConfigPath, outputPath):
     """Generate a ``buildout.cfg`` from the list of controlled packages."""
     # Load all package information from the controlled pacakge config file.
@@ -46,7 +52,8 @@
     # Create the data dictionary
     data = {
         'tested-packages': '\n    '.join(
-            [package.name for package in packages if package.tested]),
+            [getPackageSpec(package) for package in packages
+             if package.tested]),
         'versions': getVersionsListing(packages)
         }
 

Modified: zope.kgs/trunk/src/zope/kgs/kgs.py
===================================================================
--- zope.kgs/trunk/src/zope/kgs/kgs.py	2009-07-24 15:17:48 UTC (rev 102251)
+++ zope.kgs/trunk/src/zope/kgs/kgs.py	2009-07-24 15:48:32 UTC (rev 102252)
@@ -84,10 +84,11 @@
 
 class Package(object):
 
-    def __init__(self, name, versions, tested):
+    def __init__(self, name, versions, tested, testExtras):
         self.name = name
         self.versions = versions
         self.tested = tested
+        self.testExtras = testExtras
 
     def __repr__(self):
         return '<%s %r>' %(self.__class__.__name__, self.name)
@@ -143,7 +144,8 @@
                 Package(section,
                         result[section]['versions'].split(),
                         ConfigParser.ConfigParser._boolean_states[
-                            result[section]['tested']]
+                            result[section]['tested']],
+                        result[section].get('test-extras')
                         )
                 )