From 38a798237870aa2c42d6f2b5ffd2f1bcae225d62 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 28 Nov 2009 04:23:52 +0000 Subject: Fix up starter template generally. --- .../paster_templates/starter/+package+/run.py_tmpl | 2 +- .../paster_templates/starter/+package+/views.py_tmpl | 2 +- repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl | 5 +++-- repoze/bfg/paster_templates/starter/setup.py_tmpl | 19 +++++++------------ 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl index 12d2a0719..de643f834 100644 --- a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl +++ b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl @@ -2,7 +2,7 @@ from repoze.bfg.configuration import Configurator from {{package}}.models import get_root def app(global_config, **settings): - """ This function returns a repoze.bfg.router.Router object. It + """ This function returns a ``repoze.bfg`` application object. It is usually called by the PasteDeploy framework during ``paster serve``""" config = Configurator(root_factory=get_root, settings=settings) diff --git a/repoze/bfg/paster_templates/starter/+package+/views.py_tmpl b/repoze/bfg/paster_templates/starter/+package+/views.py_tmpl index adec7f939..12ed8832d 100644 --- a/repoze/bfg/paster_templates/starter/+package+/views.py_tmpl +++ b/repoze/bfg/paster_templates/starter/+package+/views.py_tmpl @@ -1,2 +1,2 @@ -def my_view(context, request): +def my_view(request): return {'project':'{{project}}'} diff --git a/repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl b/repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl index 1544cf53b..35a34f332 100644 --- a/repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl +++ b/repoze/bfg/paster_templates/starter/CHANGES.txt_tmpl @@ -1,3 +1,4 @@ -0.1 +0.0 +--- - Initial version +- Initial version diff --git a/repoze/bfg/paster_templates/starter/setup.py_tmpl b/repoze/bfg/paster_templates/starter/setup.py_tmpl index efdf36b99..df1206c1e 100644 --- a/repoze/bfg/paster_templates/starter/setup.py_tmpl +++ b/repoze/bfg/paster_templates/starter/setup.py_tmpl @@ -6,32 +6,27 @@ here = os.path.abspath(os.path.dirname(__file__)) README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() +requires = ['repoze.bfg'] + setup(name='{{project}}', - version='0.1', + version='0.0', description='{{project}}', long_description=README + '\n\n' + CHANGES, classifiers=[ - "Development Status :: 3 - Alpha", - "Intended Audience :: Developers", "Programming Language :: Python", + "Framework :: BFG", "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", ], author='', author_email='', url='', - keywords='web wsgi bfg zope', + keywords='web wsgi bfg', packages=find_packages(), include_package_data=True, zip_safe=False, - install_requires=[ - 'repoze.bfg', - ], - tests_require=[ - 'repoze.bfg', - ], + install_requires=requires, + tests_require=requires, test_suite="{{package}}", entry_points = """\ [paste.app_factory] -- cgit v1.2.3