10 files changed, 41 insertions, 19 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b4e30e085..93e526830 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -285,6 +285,8 @@ Contributors
 
 - Keith Yang, 2016/07/22
 
+- Hannah Krager, 2016/10/22
+
 - Moriyoshi Koizumi, 2016/11/20
 
 - Mikko Ohtamaa, 2016/12/6
diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/pyramid/scaffolds/starter/+package+/__init__.py
index ad5ecbc6f..49dde36d4 100644
--- a/pyramid/scaffolds/starter/+package+/__init__.py
+++ b/pyramid/scaffolds/starter/+package+/__init__.py
@@ -5,7 +5,7 @@ def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
     config = Configurator(settings=settings)
-    config.include('pyramid_chameleon')
+    config.include('pyramid_jinja2')
     config.add_static_view('static', 'static', cache_max_age=3600)
     config.add_route('home', '/')
     config.scan()
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
index 87fae3817..360855602 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="${request.locale_name}">
+<html lang="\{\{request.locale_name\}\}">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -14,7 +14,7 @@
     <link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this scaffold -->
-    <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
+    <link href="\{\{request.static_url('{{package}}:static/theme.css')\}\}" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -29,13 +29,12 @@
       <div class="container">
         <div class="row">
           <div class="col-md-2">
-            <img class="logo img-responsive" src="${request.static_url('{{package}}:static/pyramid.png')}" alt="pyramid web framework">
+            <img class="logo img-responsive" src="\{\{request.static_url('{{package}}:static/pyramid.png')\}\}" alt="pyramid web framework">
           </div>
           <div class="col-md-10">
-            <div class="content">
-              <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter scaffold</span></h1>
-              <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
-            </div>
+            {% block content %}
+                <p>No content</p>
+            {% endblock content %}
           </div>
         </div>
         <div class="row">
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
new file mode 100644
index 000000000..f826ff9e7
--- /dev/null
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
@@ -0,0 +1,8 @@
+{% extends "layout.jinja2" %} 
+
+{% block content%}
+<div class="content">
+    <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter scaffold</span></h1>
+    <p class="lead">Welcome to <span class="font-normal">\{\{project\}\}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
+</div>
+{% endblock content %}
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index ad9af7292..01b9d0130 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
@@ -1,6 +1,6 @@
 from pyramid.view import view_config
 
 
-@view_config(route_name='home', renderer='templates/mytemplate.pt')
+@view_config(route_name='home', renderer='templates/mytemplate.jinja2')
 def my_view(request):
     return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/starter/MANIFEST.in_tmpl b/pyramid/scaffolds/starter/MANIFEST.in_tmpl
index 0ff6eb7a0..4d1c86b44 100644
--- a/pyramid/scaffolds/starter/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/starter/MANIFEST.in_tmpl
@@ -1,2 +1,2 @@
 include *.txt *.ini *.cfg *.rst
-recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
+recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
diff --git a/pyramid/scaffolds/starter/setup.py_tmpl b/pyramid/scaffolds/starter/setup.py_tmpl
index 2e5ce92c7..7f50bbbc2 100644
--- a/pyramid/scaffolds/starter/setup.py_tmpl
+++ b/pyramid/scaffolds/starter/setup.py_tmpl
@@ -10,7 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
 
 requires = [
     'pyramid',
-    'pyramid_chameleon',
+    'pyramid_jinja2',
     'pyramid_debugtoolbar',
     'waitress',
     ]
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index a954d3be6..b3e3b65fa 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -22,7 +22,13 @@ def main(argv=sys.argv, quiet=False):
 
 class PCreateCommand(object):
     verbosity = 1 # required
-    description = "Render Pyramid scaffolding to an output directory"
+    description = """\
+Render Pyramid scaffolding to an output directory.
+
+Note: As of Pyramid 1.8, this command is deprecated. Use a specific
+cookiecutter instead:
+https://github.com/Pylons/?q=cookiecutter
+"""
     usage = "usage: %prog [options] -s <scaffold> output_directory"
     parser = optparse.OptionParser(usage, description=description)
     parser.add_option('-s', '--scaffold',
@@ -85,6 +91,7 @@ class PCreateCommand(object):
         self.scaffolds = self.all_scaffolds()
 
     def run(self):
+        self._warn_pcreate_deprecated()
         if self.options.list:
             return self.show_scaffolds()
         if not self.options.scaffold_name and not self.args:
@@ -224,5 +231,12 @@ class PCreateCommand(object):
         answer = input_('{0} [y|N]: '.format(prompt))
         return answer.strip().lower() == 'y'
 
+    def _warn_pcreate_deprecated(self):
+        self.out('''\
+Note: As of Pyramid 1.8, this command is deprecated. Use a specific
+cookiecutter instead:
+https://github.com/pylons/?query=cookiecutter
+''')
+
 if __name__ == '__main__': # pragma: no cover
     sys.exit(main() or 0)
diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py
index b7013bc73..0286614ce 100644
--- a/pyramid/tests/test_scripts/test_pcreate.py
+++ b/pyramid/tests/test_scripts/test_pcreate.py
@@ -26,7 +26,7 @@ class TestPCreateCommand(unittest.TestCase):
         result = cmd.run()
         self.assertEqual(result, 0)
         out = self.out_.getvalue()
-        self.assertTrue(out.startswith('Available scaffolds'))
+        self.assertTrue(out.count('Available scaffolds'))
 
     def test_run_show_scaffolds_none_exist(self):
         cmd = self._makeOne('-l')
@@ -34,7 +34,7 @@ class TestPCreateCommand(unittest.TestCase):
         result = cmd.run()
         self.assertEqual(result, 0)
         out = self.out_.getvalue()
-        self.assertTrue(out.startswith('No scaffolds available'))
+        self.assertTrue(out.count('No scaffolds available'))
 
     def test_run_no_scaffold_no_args(self):
         cmd = self._makeOne(quiet=True)
@@ -46,7 +46,7 @@ class TestPCreateCommand(unittest.TestCase):
         result = cmd.run()
         self.assertEqual(result, 2)
         out = self.out_.getvalue()
-        self.assertTrue(out.startswith(
+        self.assertTrue(out.count(
             'You must provide at least one scaffold name'))
 
     def test_no_project_name(self):
@@ -54,14 +54,14 @@ class TestPCreateCommand(unittest.TestCase):
         result = cmd.run()
         self.assertEqual(result, 2)
         out = self.out_.getvalue()
-        self.assertTrue(out.startswith('You must provide a project name'))
+        self.assertTrue(out.count('You must provide a project name'))
 
     def test_unknown_scaffold_name(self):
         cmd = self._makeOne('-s', 'dummyXX', 'distro')
         result = cmd.run()
         self.assertEqual(result, 2)
         out = self.out_.getvalue()
-        self.assertTrue(out.startswith('Unavailable scaffolds'))
+        self.assertTrue(out.count('Unavailable scaffolds'))
 
     def test_known_scaffold_single_rendered(self):
         import os
diff --git a/scaffoldtests.sh b/scaffoldtests.sh
index 69d8ad561..317bff8b5 100755
--- a/scaffoldtests.sh
+++ b/scaffoldtests.sh
@@ -1,3 +1,2 @@
 #!/bin/bash
-tox -e{py27,py33,py34,pypy}-scaffolds
-
+tox -e{py27,py34,py35,pypy}-scaffolds,