From 0a6da3800b963b2104c8e10598ac7589a81f981e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 24 Aug 2008 01:59:07 +0000
Subject:   - Remove ``sampleapp`` sample application from bfg package itself.

  - Remove dependency on FormEncode (only needed by sampleapp).

  - Fix paster template generation so that case-sensitivity is
    preserved for project vs. package name.

  - Depend on ``z3c.pt`` version 1.0a1 (which requires the ``[lxml]``
    extra currently).
---
 repoze/bfg/paster_template/+package+.ini_tmpl      | 12 ------------
 repoze/bfg/paster_template/+package+/run.py_tmpl   |  6 +++---
 repoze/bfg/paster_template/+package+/tests.py_tmpl |  8 ++++----
 repoze/bfg/paster_template/+project+.ini_tmpl      | 12 ++++++++++++
 repoze/bfg/paster_template/setup.py_tmpl           |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 repoze/bfg/paster_template/+package+.ini_tmpl
 create mode 100644 repoze/bfg/paster_template/+project+.ini_tmpl

(limited to 'repoze/bfg/paster_template')

diff --git a/repoze/bfg/paster_template/+package+.ini_tmpl b/repoze/bfg/paster_template/+package+.ini_tmpl
deleted file mode 100644
index 2d6c4d0a2..000000000
--- a/repoze/bfg/paster_template/+package+.ini_tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-debug = true
-
-[app:main]
-use = egg:{{project}}#app
-reload_templates = true
-
-[server:main]
-use = egg:PasteScript#cherrypy
-host = 0.0.0.0
-port = 6543
-numthreads = 4
diff --git a/repoze/bfg/paster_template/+package+/run.py_tmpl b/repoze/bfg/paster_template/+package+/run.py_tmpl
index b3c3d1ed7..4b3322bce 100644
--- a/repoze/bfg/paster_template/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_template/+package+/run.py_tmpl
@@ -3,9 +3,9 @@ from repoze.bfg import get_options
 
 def app(global_config, **kw):
     # paster app config callback
-    from {{project}}.models import get_root
-    import {{ project}}
-    return make_app(get_root, {{project}}, options=get_options(kw))
+    from {{package}}.models import get_root
+    import {{package}}
+    return make_app(get_root, {{package}}, options=get_options(kw))
 
 if __name__ == '__main__':
     from paste import httpserver
diff --git a/repoze/bfg/paster_template/+package+/tests.py_tmpl b/repoze/bfg/paster_template/+package+/tests.py_tmpl
index dc8dc11f3..22a7ee4e9 100644
--- a/repoze/bfg/paster_template/+package+/tests.py_tmpl
+++ b/repoze/bfg/paster_template/+package+/tests.py_tmpl
@@ -11,10 +11,10 @@ class ViewTests(unittest.TestCase):
         # should explore ways to do that rather than rely on ZCML (see
         # the repoze.bfg tests for inspiration).
         self._cleanup()
-        import {{project}}
+        import {{package}}
         import zope.configuration.xmlconfig
         zope.configuration.xmlconfig.file('configure.zcml',
-                                          package={{project}})
+                                          package={{package}})
 
     def tearDown(self):
         self._cleanup()
@@ -25,13 +25,13 @@ class ViewTests(unittest.TestCase):
         cleanUp()
         
     def test_my_view(self):
-        from {{project}}.views import my_view
+        from {{package}}.views import my_view
         context = DummyContext()
         request = DummyRequest()
         result = my_view(context, request)
         self.assertEqual(result.status, '200 OK')
         body = result.app_iter[0]
-        self.failUnless('Welcome to {{project}}' in body)
+        self.failUnless('Welcome to {{package}}' in body)
         self.assertEqual(len(result.headerlist), 2)
         self.assertEqual(result.headerlist[0],
                          ('content-type', 'text/html; charset=UTF-8'))
diff --git a/repoze/bfg/paster_template/+project+.ini_tmpl b/repoze/bfg/paster_template/+project+.ini_tmpl
new file mode 100644
index 000000000..2d6c4d0a2
--- /dev/null
+++ b/repoze/bfg/paster_template/+project+.ini_tmpl
@@ -0,0 +1,12 @@
+[DEFAULT]
+debug = true
+
+[app:main]
+use = egg:{{project}}#app
+reload_templates = true
+
+[server:main]
+use = egg:PasteScript#cherrypy
+host = 0.0.0.0
+port = 6543
+numthreads = 4
diff --git a/repoze/bfg/paster_template/setup.py_tmpl b/repoze/bfg/paster_template/setup.py_tmpl
index d2b4d575b..61a7302e4 100644
--- a/repoze/bfg/paster_template/setup.py_tmpl
+++ b/repoze/bfg/paster_template/setup.py_tmpl
@@ -35,10 +35,10 @@ setup(name='{{project}}',
       tests_require=[
             'repoze.bfg',
             ],
-      test_suite="{{project}}",
+      test_suite="{{package}}",
       entry_points = """\
       [paste.app_factory]
-      app = {{project}}.run:app
+      app = {{package}}.run:app
       """
       )
 
-- 
cgit v1.2.3