[Checkins] SVN: bluebream/branches/ccomb-remove-bbkit/ Allow to choose the version of bluebream during project creation

Christophe Combelles ccomb at free.fr
Fri Jul 9 16:17:50 EDT 2010


Log message for revision 114419:
  Allow to choose the version of bluebream during project creation
  

Changed:
  U   bluebream/branches/ccomb-remove-bbkit/buildout.cfg
  U   bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/buildout.cfg_tmpl
  D   bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/versions.cfg
  U   bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/template.py
  A   bluebream/branches/ccomb-remove-bbkit/versions.cfg

-=-
Modified: bluebream/branches/ccomb-remove-bbkit/buildout.cfg
===================================================================
--- bluebream/branches/ccomb-remove-bbkit/buildout.cfg	2010-07-09 20:15:12 UTC (rev 114418)
+++ bluebream/branches/ccomb-remove-bbkit/buildout.cfg	2010-07-09 20:17:49 UTC (rev 114419)
@@ -5,16 +5,24 @@
         test
         tools
 
-extends = src/bluebream/bluebream_base/project_template/versions.cfg
+extends = versions.cfg
 
 versions = versions
 allow-picked-versions = false
 
+
+[versions]
+# additional versions for the toolchain
+zest.releaser = 3.10
+PrettyTable = 0.5
+
+
 [bluebream]
 recipe = zc.recipe.egg
 eggs = bluebream [test]
        PasteScript
 
+
 [test]
 # run test of additional packages used by bluebream
 recipe = z3c.recipe.compattest
@@ -30,12 +38,7 @@
 
 interpreter = py
 
-[versions]
-# additional versions for the toolchain
-zest.releaser = 3.10
-PrettyTable = 0.5
 
-
 [bbkit]
 # additional packages on top of the ZTK
 version = 1.0dev

Modified: bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/buildout.cfg_tmpl
===================================================================
--- bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/buildout.cfg_tmpl	2010-07-09 20:15:12 UTC (rev 114418)
+++ bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/buildout.cfg_tmpl	2010-07-09 20:17:49 UTC (rev 114419)
@@ -1,8 +1,8 @@
 [buildout]
 develop = .
-extends = versions.cfg
+extends = http://download.zope.org/bluebream/bluebream-${bluebream}.cfg
 parts = app
-        test 
+        test
 
 [app]
 recipe = zc.recipe.egg

Deleted: bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/versions.cfg
===================================================================
--- bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/versions.cfg	2010-07-09 20:15:12 UTC (rev 114418)
+++ bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/project_template/versions.cfg	2010-07-09 20:17:49 UTC (rev 114419)
@@ -1,21 +0,0 @@
-[buildout]
-extends = http://download.zope.org/zopetoolkit/index/1.0a2/ztk-versions.cfg
-          http://download.zope.org/zopetoolkit/index/1.0a2/zopeapp-versions.cfg
-          
-
-[versions]
-# Pin-down versions of other dependencies here. Eg:-
-# z3c.form = 2.3.2
-# z3c.formui = 2.2.0
-bluebream = 1.0b2
-elementtree = 1.2.6-20050316
-zope.app.xmlrpcintrospection = 3.5.1
-z3c.testsetup = 0.6.1
-zc.table = 0.8.0
-#zc.queue = 1.1
-#lovely.remotetask = 0.5
-
-# Dependencies:
-ClientForm = 0.2.10
-martian = 0.12
-

Modified: bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/template.py
===================================================================
--- bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/template.py	2010-07-09 20:15:12 UTC (rev 114418)
+++ bluebream/branches/ccomb-remove-bbkit/src/bluebream/bluebream_base/template.py	2010-07-09 20:17:49 UTC (rev 114419)
@@ -24,26 +24,27 @@
 
     vars = [
         var('python_package',
-            'Main Python package (with namespace, if any)'),
+            u'Main Python package (with namespace, if any)'),
         var('interpreter',
-            'Name of custom Python interpreter',
+            u'Name of custom Python interpreter',
             default='breampy'),
-        var('version', 'Version (like 0.1)', default='0.1'),
-        var('description', 'One-line description of the package'),
-        var('long_description', 'Multi-line description (in reST)'),
-        var('keywords', 'Space-separated keywords/tags'),
-        var('author', 'Author name'),
-        var('author_email', 'Author email'),
-        var('url', 'URL of homepage'),
-        var('license_name', 'License name'),
-        var('zip_safe',
-            'True/False: if the package can be distributed as a .zip file',
-            default=False),
+        var('bluebream', u'Which version of BlueBream?',
+            default=pkg_resources.get_distribution('bluebream').version),
+        var('version', u'Version of your project', default='0.1'),
+        var('description', u'One-line description of the package'),
+        var('long_description', u'Multi-line description (in reST)'),
+        var('keywords', u'Space-separated keywords/tags'),
+        var('author', u'Author name'),
+        var('author_email', u'Author email'),
+        var('url', u'URL of homepage'),
+        var('license_name', u'License name'),
         ]
 
     def check_vars(self, vars, cmd):
         """This method checks the variables and ask for missing ones
         """
+        # todo: detect available versions online, and suggest the latest
+
         # suggest what Paste chose
         for var in self.vars:
             if var.name == 'python_package':
@@ -66,6 +67,7 @@
                 "package name: %s." % name
             print "Please choose a different project name."
             sys.exit(1)
+        vars['zip_safe'] = False
         return vars
 
     def pre(self, command, output_dir, vars):

Added: bluebream/branches/ccomb-remove-bbkit/versions.cfg
===================================================================
--- bluebream/branches/ccomb-remove-bbkit/versions.cfg	                        (rev 0)
+++ bluebream/branches/ccomb-remove-bbkit/versions.cfg	2010-07-09 20:17:49 UTC (rev 114419)
@@ -0,0 +1,22 @@
+# main version file for BlueBream
+
+[buildout]
+extends = http://download.zope.org/zopetoolkit/index/1.0a2/ztk-versions.cfg
+          http://download.zope.org/zopetoolkit/index/1.0a2/zopeapp-versions.cfg
+
+
+[versions]
+# Pin-down versions of other dependencies here. Eg:-
+# z3c.form = 2.3.2
+# z3c.formui = 2.2.0
+elementtree = 1.2.6-20050316
+zope.app.xmlrpcintrospection = 3.5.1
+z3c.testsetup = 0.6.1
+zc.table = 0.8.0
+#zc.queue = 1.1
+#lovely.remotetask = 0.5
+
+# Dependencies:
+ClientForm = 0.2.10
+martian = 0.12
+



More information about the checkins mailing list