Stephen Martin
2018-09-17 28e688f1a41215cb6167f8e53de017ddb82b552f
name change
9 files modified
58 ■■■■ changed files
docs/glossary.rst 4 ●●●● patch | view | raw | blame | history
docs/narr/cookiecutters.rst 4 ●●●● patch | view | raw | blame | history
docs/narr/project.rst 14 ●●●● patch | view | raw | blame | history
docs/quick_tour.rst 14 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/cookiecutters.rst 6 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/databases.rst 2 ●●● patch | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 4 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki/installation.rst 4 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 6 ●●●● patch | view | raw | blame | history
docs/glossary.rst
@@ -1155,9 +1155,9 @@
   cookiecutter
      A command-line utility that creates projects from :ref:`cookiecutters <cookiecutter:readme>` (project templates), e.g., creating a Python package project from a Python package project template.
      The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged features from the three previous cookiecutters which are now deprecated.
      The unified cookiecutter ``pyramid-cookiecutter-starter`` merged features from the three previous cookiecutters which are now deprecated.
      * `pyramid-cookiecutter-theonecc <https://github.com/Pylons/pyramid-cookiecutter-theonecc>`_
      * `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
      .. versionadded:: 1.10
docs/narr/cookiecutters.rst
@@ -16,11 +16,11 @@
A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters <cookiecutter:readme>` (project templates), e.g., creating a Python package project from a Python package project template.
The unified cookiecutter ``pyramid-cookiecutter-theonecc`` merged features from the three previous cookiecutters which are now deprecated.
The unified cookiecutter ``pyramid-cookiecutter-starter`` merged features from the three previous cookiecutters which are now deprecated.
The Pyramid cookiecutter has replaced the now deprecated Pyramid scaffolds, and should be used going forward and can be found here:
* `pyramid-cookiecutter-theonecc <https://github.com/Pylons/pyramid-cookiecutter-theonecc>`_
* `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
.. seealso::
docs/narr/project.rst
@@ -28,7 +28,7 @@
.. index::
   single: cookiecutters
   single: pyramid-cookiecutter-theonecc
   single: pyramid-cookiecutter-starter
.. _additional_cookiecutters:
@@ -43,7 +43,7 @@
- the mechanism of mapping URLs to code (:term:`URL dispatch` or :term:`traversal`)
* `pyramid-cookiecutter-theonecc <https://github.com/Pylons/pyramid-cookiecutter-theonecc>`_
* `pyramid-cookiecutter-starter <https://github.com/Pylons/pyramid-cookiecutter-starter>`_
All configuration options offer a choice of templating language.
@@ -83,13 +83,13 @@
.. code-block:: bash
    cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
If prompted for the first item, accept the default ``yes`` by hitting return.
.. code-block:: text
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-theonecc before.
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
    Is it okay to delete and re-clone it? [yes]: yes
    project_name [Pyramid Scaffold]: myproject
    repo_name [myproject]: myproject
@@ -265,7 +265,7 @@
    ..
    2 passed in 0.47 seconds
The tests themselves are found in the ``tests.py`` module in your ``cookiecutter``-generated project.  Within a project generated by the ``pyramid-cookiecutter-theonecc`` cookiecutter, only two sample tests exist.
The tests themselves are found in the ``tests.py`` module in your ``cookiecutter``-generated project.  Within a project generated by the ``pyramid-cookiecutter-starter`` cookiecutter, only two sample tests exist.
.. note::
@@ -437,7 +437,7 @@
.. image:: project.png
This is the page shown by default when you visit an unmodified ``cookiecutter``
generated ``pyramid-cookiecutter-theonecc`` application in a browser.
generated ``pyramid-cookiecutter-starter`` application in a browser.
.. index::
   single: debug toolbar
@@ -518,7 +518,7 @@
The Project Structure
---------------------
The ``pyramid-cookiecutter-theonecc`` cookiecutter generated a :term:`project` (named ``myproject``),
The ``pyramid-cookiecutter-starter`` cookiecutter generated a :term:`project` (named ``myproject``),
which contains a Python :term:`package`.  The package is *also* named
``myproject``; the cookiecutter generates a project which
contains a package that shares its name.
docs/quick_tour.rst
@@ -506,17 +506,17 @@
    $VENV/bin/pip install cookiecutter
Let's use the cookiecutter ``pyramid-cookiecutter-theonecc`` to create a starter Pyramid project in the current directory, entering values at the prompts as shown below for the following command.
Let's use the cookiecutter ``pyramid-cookiecutter-starter`` to create a starter Pyramid project in the current directory, entering values at the prompts as shown below for the following command.
.. code-block:: bash
    $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
If prompted for the first item, accept the default ``yes`` by hitting return.
.. code-block:: text
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-theonecc before.
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
    Is it okay to delete and re-clone it? [yes]: yes
    project_name [Pyramid Scaffold]: hello_world
    repo_name [hello_world]: hello_world
@@ -646,7 +646,7 @@
available in your browser. Adding it to your project illustrates several points
about configuration.
Our cookiecutter ``pyramid-cookiecutter-theonecc`` already configured our package to include the
Our cookiecutter ``pyramid-cookiecutter-starter`` already configured our package to include the
add-on ``pyramid_debugtoolbar`` in its ``setup.py``:
.. literalinclude:: quick_tour/package/setup.py
@@ -687,7 +687,7 @@
egregious, as Pyramid has had a deep commitment to full test coverage since
before its release.
Our ``pyramid-cookiecutter-theonecc`` cookiecutter generated a ``tests.py`` module with
Our ``pyramid-cookiecutter-starter`` cookiecutter generated a ``tests.py`` module with
one unit test and one functional test in it. It also configured ``setup.py`` with test requirements:
``py.test`` as the test runner, ``WebTest`` for running view tests, and the
``pytest-cov`` tool which yells at us for code that isn't tested:
@@ -863,13 +863,13 @@
.. code-block:: bash
    cd ~
    env/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    env/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
If prompted for the first item, accept the default ``yes`` by hitting return.
.. code-block:: text
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-theonecc before.
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
    Is it okay to delete and re-clone it? [yes]: yes
    project_name [Pyramid Scaffold]: sqla_demo
    repo_name [sqla_demo]: sqla_demo
docs/quick_tutorial/cookiecutters.rst
@@ -24,17 +24,17 @@
        $VENV/bin/pip install cookiecutter
#.  Let's use the cookiecutter ``pyramid-cookiecutter-theonecc`` to create a starter :app:`Pyramid` project in the current directory, entering values at the prompts as shown below for the following command.
#.  Let's use the cookiecutter ``pyramid-cookiecutter-starter`` to create a starter :app:`Pyramid` project in the current directory, entering values at the prompts as shown below for the following command.
    .. code-block:: bash
        $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
        $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
    If prompted for the first item, accept the default ``yes`` by hitting return.
    .. code-block:: text
        You've cloned ~/.cookiecutters/pyramid-cookiecutter-theonecc before.
        You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
        Is it okay to delete and re-clone it? [yes]: yes
        project_name [Pyramid Scaffold]: cc_starter
        repo_name [cc_starter]: cc_starter
docs/quick_tutorial/databases.rst
@@ -21,7 +21,7 @@
.. note::
    The Pyramid cookiecutter ``pyramid-cookiecutter-theonecc`` is really
    The Pyramid cookiecutter ``pyramid-cookiecutter-starter`` is really
    helpful for getting a SQLAlchemy project going, including generation of
    the console script. Since we want to see all the decisions, we will forgo
    convenience in this tutorial, and wire it up ourselves.
docs/tutorials/modwsgi/index.rst
@@ -39,13 +39,13 @@
    .. code-block:: bash
        cd ~
        cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
        cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
    If prompted for the first item, accept the default ``yes`` by hitting return.
    .. code-block:: text
        You've cloned ~/.cookiecutters/pyramid-cookiecutter-theonecc before.
        You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
        Is it okay to delete and re-clone it? [yes]: yes
        project_name [Pyramid Scaffold]: myproject
        repo_name [myproject]: myproject
docs/tutorials/wiki/installation.rst
@@ -31,7 +31,7 @@
.. code-block:: bash
    cd ~
    cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
On Windows
^^^^^^^^^^
@@ -39,7 +39,7 @@
.. code-block:: doscon
    cd \
    cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^
docs/tutorials/wiki2/installation.rst
@@ -43,7 +43,7 @@
.. code-block:: bash
    cd ~
    cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
On Windows
^^^^^^^^^^
@@ -51,7 +51,7 @@
.. code-block:: doscon
    cd \
    cookiecutter gh:Pylons/pyramid-cookiecutter-theonecc --checkout master
    cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -59,7 +59,7 @@
.. code-block:: text
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-theonecc before.
    You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
    Is it okay to delete and re-clone it? [yes]: yes
    project_name [Pyramid Scaffold]: myproj
    repo_name [myproj]: tutorial