[Checkins] SVN: grokproject/trunk/ * By default,
zc.buildout will now be told to place eggs in a
Philipp von Weitershausen
philikon at philikon.de
Sat Jul 14 06:27:44 EDT 2007
Log message for revision 77908:
* By default, zc.buildout will now be told to place eggs in a
user-specified shared eggs directory. Also, it will not look for
newer versions of existing eggs by default.
Changed:
U grokproject/trunk/README.txt
U grokproject/trunk/TODO.txt
U grokproject/trunk/grokproject/__init__.py
U grokproject/trunk/grokproject/template/buildout.cfg_tmpl
-=-
Modified: grokproject/trunk/README.txt
===================================================================
--- grokproject/trunk/README.txt 2007-07-14 10:18:21 UTC (rev 77907)
+++ grokproject/trunk/README.txt 2007-07-14 10:27:43 UTC (rev 77908)
@@ -35,6 +35,10 @@
* Fixed https://bugs.launchpad.net/grok/+bug/119805:
A new project created with grokproject can't be called 'grok' or 'zope'.
+* By default, zc.buildout will now be told to place eggs in a
+ user-specified shared eggs directory. Also, it will not look for
+ newer versions of existing eggs by default.
+
0.4 (2007-09-12)
----------------
Modified: grokproject/trunk/TODO.txt
===================================================================
--- grokproject/trunk/TODO.txt 2007-07-14 10:18:21 UTC (rev 77907)
+++ grokproject/trunk/TODO.txt 2007-07-14 10:27:43 UTC (rev 77908)
@@ -2,9 +2,6 @@
the logging handler, so subsequent logging calls are multiplied).
See https://bugs.launchpad.net/zc.buildout/+bug/125729.
-* generate a buildout.cfg with
- - eggs-directory = ...
- - newest = false
* Allow values to be provided thru command line arguments
See https://bugs.launchpad.net/grok/+bug/125817.
Modified: grokproject/trunk/grokproject/__init__.py
===================================================================
--- grokproject/trunk/grokproject/__init__.py 2007-07-14 10:18:21 UTC (rev 77907)
+++ grokproject/trunk/grokproject/__init__.py 2007-07-14 10:27:43 UTC (rev 77908)
@@ -18,6 +18,8 @@
var('user', 'Name of an initial administrator user', default=NoDefault),
var('passwd', 'Password for the initial administrator user',
default=NoDefault),
+ var('eggs_dir', 'Location where zc.buildout will look for and place '
+ 'packages', default=os.path.expanduser('~/buildout-eggs'))
]
def check_vars(self, vars, cmd):
@@ -34,6 +36,7 @@
"package name: %s." % vars['package']
print "Please choose a different project name."
sys.exit(1)
+ vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
return vars
def main():
@@ -45,7 +48,9 @@
parser.add_option('--svn-repository', dest="repos", default=None,
help="Import project to given repository location (this "
"will also create the standard trunk/ tags/ branches/ "
- "hierarchy)")
+ "hierarchy).")
+ parser.add_option('--newer', action="store_true", dest="newest",
+ default=False, help="Check for newer versions of packages.")
parser.add_option('-v', '--verbose', action="store_true", dest="verbose",
default=False, help="Be verbose.")
options, args = parser.parse_args()
@@ -59,12 +64,20 @@
cmd = commands['create'].load()
runner = cmd('create')
- extra_args = []
+ option_args = []
if options.repos is not None:
- extra_args.extend(['--svn-repository', options.repos])
+ option_args.extend(['--svn-repository', options.repos])
if not options.verbose:
- extra_args.append('-q')
- exit_code = runner.run(extra_args + ['-t', 'grokproject', project])
+ option_args.append('-q')
+
+ extra_args = []
+ if options.newest:
+ extra_args.append('newest=true')
+ else:
+ extra_args.append('newest=false')
+
+ exit_code = runner.run(option_args + ['-t', 'grokproject', project]
+ + extra_args)
# TODO exit_code
if options.no_buildout:
@@ -72,6 +85,10 @@
os.chdir(project)
+ extra_args = []
+ if not options.verbose:
+ extra_args.append('-q')
+
try:
import zc.buildout.buildout
except ImportError:
@@ -81,9 +98,6 @@
import setuptools.command.easy_install
tmpdir = tempfile.mkdtemp()
sys.path.append(tmpdir)
- extra_args = []
- if not options.verbose:
- extra_args.append('-q')
setuptools.command.easy_install.main(extra_args +
['-mNxd', tmpdir, 'zc.buildout'])
Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl 2007-07-14 10:18:21 UTC (rev 77907)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl 2007-07-14 10:27:43 UTC (rev 77908)
@@ -2,6 +2,8 @@
develop = .
parts = app data zopectl test
find-links = http://download.zope.org/distribution/
+eggs-directory = ${eggs_dir}
+newest = ${newest}
[zope3]
# this dead chicken is needed by some other recipe(s)
More information about the Checkins
mailing list