[Checkins] SVN: grokproject/trunk/ Added local download of the
current fixed versions as versions.cfg.
Reinout van Rees
reinout at vanrees.org
Fri May 2 14:42:44 EDT 2008
Log message for revision 86119:
Added local download of the current fixed versions as versions.cfg.
Changed:
_U grokproject/trunk/
U grokproject/trunk/CHANGES.txt
U grokproject/trunk/grokproject/__init__.py
U grokproject/trunk/grokproject/template/buildout.cfg_tmpl
A grokproject/trunk/grokproject/template/versions.cfg_tmpl
U grokproject/trunk/tests.txt
-=-
Property changes on: grokproject/trunk
___________________________________________________________________
Name: svn:ignore
- build
bin
dist
eggs
develop-eggs
parts
.installed.cfg
grokproject.egg-info
+ *.egg
build
bin
dist
eggs
develop-eggs
parts
.installed.cfg
grokproject.egg-info
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt 2008-05-02 18:35:22 UTC (rev 86118)
+++ grokproject/trunk/CHANGES.txt 2008-05-02 18:42:44 UTC (rev 86119)
@@ -4,6 +4,8 @@
0.8 (unreleased)
------------------
+* Added local download of the current fixed versions as versions.cfg.
+
* Add bin/test
* Add handling for the eggs-directory option in buildout.cfg, taken
Modified: grokproject/trunk/grokproject/__init__.py
===================================================================
--- grokproject/trunk/grokproject/__init__.py 2008-05-02 18:35:22 UTC (rev 86118)
+++ grokproject/trunk/grokproject/__init__.py 2008-05-02 18:42:44 UTC (rev 86119)
@@ -52,14 +52,7 @@
value = option.default
return value
-def get_version_info_url(vars, option):
- value = vars.get(option.name, '')
- if value == '':
- info = urllib.urlopen(VERSIONINFO_INFO_URL).read().strip()
- value = urlparse.urljoin(VERSIONINFO_INFO_URL, info)
- return value
-
class GrokProject(templates.Template):
_template_dir = 'template'
summary = "A grok project"
@@ -72,9 +65,6 @@
ask_var('newest', 'Check for newer versions of packages',
default='false', should_ask=False,
getter=get_boolean_value_for_option),
- ask_var('version_info_url',
- "The URL to a *.cfg file containing a [versions] section.",
- default='', should_ask=False, getter=get_version_info_url),
ask_var('run_buildout', "After creating the project area "
"bootstrap the buildout.",
default=True, should_ask=False,
@@ -105,7 +95,17 @@
# Escape values that go in site.zcml.
vars[var_name] = xml.sax.saxutils.quoteattr(vars[var_name])
vars['app_class_name'] = vars['project'].capitalize()
+ vars = self.extra_vars(vars)
+ return vars
+ def extra_vars(self, vars):
+ # Handling the version.cfg file.
+ info = urllib.urlopen(VERSIONINFO_INFO_URL).read().strip()
+ version_info_url = urlparse.urljoin(VERSIONINFO_INFO_URL, info)
+ vars['version_info_url'] = version_info_url
+ version_info_file_contents = urllib.urlopen(version_info_url).read()
+ vars['version_info_file_contents'] = version_info_file_contents
+ # Handling eggs dir.
buildout_default = get_buildout_default_eggs_dir()
input = os.path.expanduser(vars['eggs_dir'])
if input == buildout_default:
@@ -119,6 +119,7 @@
'# Consider adding this to the .buildout/default.cfg in your '
'home directory.\n'
'eggs-directory = %s') % input
+
return vars
def post(self, command, output_dir, vars):
Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl 2008-05-02 18:35:22 UTC (rev 86118)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl 2008-05-02 18:42:44 UTC (rev 86119)
@@ -3,7 +3,7 @@
parts = app data zopectl i18n test
find-links = http://download.zope.org/distribution/
newest = ${newest}
-extends = ${version_info_url}
+extends = versions.cfg
${eggs_dir}
versions = versions
Added: grokproject/trunk/grokproject/template/versions.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/versions.cfg_tmpl (rev 0)
+++ grokproject/trunk/grokproject/template/versions.cfg_tmpl 2008-05-02 18:42:44 UTC (rev 86119)
@@ -0,0 +1,6 @@
+# This file contains a list of versions of the various grok modules that
+# belong together.
+# It was downloaded from ${version_info_url}
+# when this project was created.
+
+${version_info_file_contents}
Modified: grokproject/trunk/tests.txt
===================================================================
--- grokproject/trunk/tests.txt 2008-05-02 18:35:22 UTC (rev 86118)
+++ grokproject/trunk/tests.txt 2008-05-02 18:42:44 UTC (rev 86119)
@@ -27,6 +27,7 @@
parts
setup.py
src
+ versions.cfg
>>> sofware_dir = os.path.join(package_dir, 'src', 'grokexample')
>>> ls(sofware_dir)
More information about the Checkins
mailing list