Merge pull request #390 from Cornices/388-remove-scaffold

Remove scaffold from repo (fixes #388)
Cornices · Oct 19, 2016 · 42565c9 · 42565c9
2 parents 7fcc5bf + f6cd967
commit 42565c9
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 162 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,3 @@
 include *.txt
 include *.rst
 include LICENSE
-recursive-include cornice/scaffolds *.*
-recursive-include cornice/tests *.rx
diff --git a/cornice/scaffolds/__init__.py b/cornice/scaffolds/__init__.py
diff --git a/cornice/scaffolds/cornice/+package+.ini_tmpl b/cornice/scaffolds/cornice/+package+.ini_tmpl
diff --git a/cornice/scaffolds/cornice/+package+/__init__.py_tmpl b/cornice/scaffolds/cornice/+package+/__init__.py_tmpl
diff --git a/cornice/scaffolds/cornice/+package+/views.py_tmpl b/cornice/scaffolds/cornice/+package+/views.py_tmpl
diff --git a/cornice/scaffolds/cornice/README.rst_tmpl b/cornice/scaffolds/cornice/README.rst_tmpl
diff --git a/cornice/scaffolds/cornice/setup.py_tmpl b/cornice/scaffolds/cornice/setup.py_tmpl
diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
@@ -9,9 +9,9 @@ To use Cornice, install it::
     $ pip install cornice
 
 
-That'll give you a Paster template to use::
+You can use a `Cookiecutter <https://cookiecutter.readthedocs.io>`_ project template::
 
-    $ pcreate -t cornice project
+    $ cookiecutter gh:Cornices/cookiecutter-cornice
     ...
 
 The template creates a working Cornice application.

diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst
@@ -53,29 +53,13 @@ Once you have it, install Cornice in it with Pip::
 
     $ bin/pip install cornice
 
-Cornice provides a Paster Template you can use to create a new
-application::
-
-    $ bin/pcreate -t cornice messaging
-    Creating directory <...path ...>/messaging
-      Recursing into +package+
-        Creating <...path ...>/messaging/messaging/
-        Copying __init__.py_tmpl to <...path ...>/messaging/messaging/__init__.py
-        Copying views.py_tmpl to <...path ...>/messaging/messaging/views.py
-      Copying +package+.ini_tmpl to <...path ...>/messaging/messaging.ini
-      Copying README.rst_tmpl to <...path ...>/messaging/README.rst
-      Copying setup.py_tmpl to <...path ...>/messaging/setup.py
-
-    ===============================================================================
-    Tutorials: http://docs.pylonsproject.org/projects/pyramid_tutorials
-    Documentation: http://docs.pylonsproject.org/projects/pyramid
-
-    Twitter (tips & updates): http://twitter.com/pylons
-    Mailing List: http://groups.google.com/group/pylons-discuss
-
-    Welcome to Pyramid.  Sorry for the convenience.
-    ===============================================================================
+We provide a `Cookiecutter <https://cookiecutter.readthedocs.io>`_ template you
+can use to create a new application::
 
+    $ bin/pip install cookiecutter
+    $ bin/cookiecutter gh:Cornices/cookiecutter-cornice
+    repo_name [myapp]: messaging
+    project_title [My Cornice application.]: Cornice tutorial
 
 Once your application is generated, go there and call *develop* against it::
 

diff --git a/docs/source/upgrading.rst b/docs/source/upgrading.rst
@@ -4,6 +4,14 @@ Upgrading
 1.X to 2.X
 ==========
 
+Project template
+----------------
+
+We now rely on `Cookiecutter <https://cookiecutter.readthedocs.io>`_ instead of
+the deprecated Pyramid scaffolding feature::
+
+    $ cookiecutter gh:Cornices/cookiecutter-cornice
+
 Validators
 ----------
 
@@ -122,4 +130,3 @@ After:
 
     schema = [kwargs['schema'] for method, view, kwargs in service.definitions
               if method == "POST"][0]
-
diff --git a/setup.py b/setup.py
@@ -11,17 +11,8 @@
 
 requires = ['pyramid',  'simplejson']
 
-entry_points = """\
-[paste.paster_create_template]
-cornice=cornice.scaffolds:CorniceTemplate
-[pyramid.scaffold]
-cornice=cornice.scaffolds:CorniceTemplate
-"""
-
-package_data = {
-    "cornice.scaffolds": [
-        "cornice/*.*",
-        "cornice/+package+/*.*"]}
+entry_points = ""
+package_data = {}
 
 setup(name='cornice',
       version='1.3.0.dev0',