[Checkins] SVN: grokproject/trunk/ The application specific verion pins are now in Grok's versions cfg.

[Jan-Jaap Driessen]

Log message for revision 110888:
  The application specific verion pins are now in Grok's versions cfg.

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/grokproject/templates.py
  U   grokproject/trunk/grokproject/utils.py

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2010-04-14 13:52:18 UTC (rev 110887)
+++ grokproject/trunk/CHANGES.txt	2010-04-14 13:53:18 UTC (rev 110888)
@@ -4,11 +4,12 @@
 1.0.4 (unreleased)
 ------------------
 
+* The application specific version pins are now in Grok's versions cfg.
+
 * Remove '--zopectl' option. Paster setups are now the only supported
   method to create new projects.
   Fix bug https://bugs.launchpad.net/grok/+bug/524262
 
-
 1.0.3 (2010-02-21)
 ------------------
 

Modified: grokproject/trunk/grokproject/templates.py
===================================================================
--- grokproject/trunk/grokproject/templates.py	2010-04-14 13:52:18 UTC (rev 110887)
+++ grokproject/trunk/grokproject/templates.py	2010-04-14 13:53:18 UTC (rev 110888)
@@ -12,7 +12,6 @@
 from grokproject.utils import create_buildout_default_file
 from grokproject.utils import exist_buildout_default_file
 from grokproject.utils import required_grok_version
-from grokproject.utils import extend_versions_cfg
 
 GROK_RELEASE_URL_DEFAULT = 'http://grok.zope.org/releaseinfo/'
 
@@ -89,10 +88,6 @@
         vars['version_info_url'] = version_info_url
         vars['version_info_file_contents'] = self.download(version_info_url)
 
-        # Maybe add additional eggs...
-        vars['version_info_additions'] = extend_versions_cfg(
-            vars['version_info_file_contents'])
-
         # Which grok version are we depending on?
         version = required_grok_version(vars['version_info_file_contents'])
         vars['grokversion'] = version

Modified: grokproject/trunk/grokproject/utils.py
===================================================================
--- grokproject/trunk/grokproject/utils.py	2010-04-14 13:52:18 UTC (rev 110887)
+++ grokproject/trunk/grokproject/utils.py	2010-04-14 13:53:18 UTC (rev 110888)
@@ -173,30 +173,3 @@
         if line.startswith('grok ='):
             return line.split(' ')[-1]
 
-
-def extend_versions_cfg(versions_cfg):
-    """Add additional package versions for versions.cfg.
-    
-    We only add eggs that are not already included in versions.cfg
-    fetched from the release info URL (usually grok.zope.org/releaseinfo).
-    """
-    here = os.path.dirname(__file__)
-    additional_eggs = open(
-        os.path.join(here, 'ext_eggs.cfg'), 'rb').read()
-        
-    # Create a list of already pinned eggs...
-    pinned = list()
-    for line in versions_cfg.split('\n'):
-        if not " " in line:
-            continue
-        pinned.append(line.split(' ')[0].strip())
-
-    result = ''
-    for line in additional_eggs.split('\n'):
-        if ' ' in line:
-            if line.split(' ')[0].strip() in pinned:
-                # Skip eggs already in versions.cfg...
-                continue
-            pass
-        result += '%s\n' % line
-    return result