[templates.merlot] push by esar...@gmail.com - Removed development bits from the buildout template and added explanat... on 2011-04-02 16:30 GMT

[mer...@googlecode.com]

Revision: 0d9b08bf0562
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sat Apr 2 09:29:20 2011
Log: Removed development bits from the buildout template and added
explanatory comments.
http://code.google.com/p/merlot/source/detail?repo=templates&r=0d9b08bf0562

Modified:
/docs/HISTORY.txt
/merlot/templates/merlot_buildout/buildout.cfg_tmpl
/setup.py

=======================================
--- /docs/HISTORY.txt Fri Mar 25 17:05:34 2011
+++ /docs/HISTORY.txt Sat Apr 2 09:29:20 2011
@@ -1,6 +1,14 @@
Changelog
=========

+
+0.2 (unreleased)
+----------------
+
+ * Removed buildout parts and extensions that are specific to development
from
+ the Merlot buildout template. [emanuel]
+ * Explanatory comments added to the Merlot buildout template. [emanuel]
+
0.1.1 - 2011-03-26
------------------

=======================================
--- /merlot/templates/merlot_buildout/buildout.cfg_tmpl Fri Mar 25 16:31:58
2011
+++ /merlot/templates/merlot_buildout/buildout.cfg_tmpl Sat Apr 2 09:29:20
2011
@@ -1,9 +1,24 @@
+# This buildout configuration file extends from the buildout configuration
+# files included in the Merlot release pinned in the `versions` part below.
+# The `parts` attribute is redefined to remove the bits that are specific
to
+# development. The `develop` and `extensions` attributes are left blank
for the
+# same reason.
[buildout]
extends =
http://merlot.googlecode.com/hg/buildout.cfg?r=${merlot_version}
http://merlot.googlecode.com/hg/versions.cfg?r=${merlot_version}
+parts =
+ app
+ merlot_server
+ debug_ini
+ deploy_ini
+ mkdirs
+ site_zcml
+ zope_conf
+ zpasswd
versions = versions
develop =
+extensions =

[versions]
Merlot = ${merlot_version}
=======================================
--- /setup.py Fri Mar 25 17:05:34 2011
+++ /setup.py Sat Apr 2 09:29:20 2011
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os

-version = '0.1.1'
+version = '0.2'

setup(name='MerlotTemplates',
version=version,