From 6b6d0e4c2b4e56523bd41aefd9d462858e03f443 Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Sun, 9 Sep 2018 17:05:27 -0700 Subject: merging cookiecutters --- docs/narr/cookiecutters.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index abedb25b9..4c10229a6 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -7,11 +7,9 @@ Pyramid cookiecutters A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters ` (project templates), e.g., creating a Python package project from a Python package project template. -Pyramid cookiecutters have replaced the now deprecated Pyramid scaffolds, and should be used going forward. Pyramid cookiecutters released under the Pylons Project include: +The Pyramid cookiecutter has replaced the now deprecated Pyramid scaffolds, and should be used going forward and can be found here: -* `pyramid-cookiecutter-alchemy `_ -* `pyramid-cookiecutter-starter `_ -* `pyramid-cookiecutter-zodb `_ +* `pyramid-cookiecutter-theonecc `_ .. seealso:: -- cgit v1.2.3 From f2520e5910861beac0199aa424ba282f856f79b3 Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Sun, 16 Sep 2018 15:46:31 -0700 Subject: doc fixes --- docs/narr/cookiecutters.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index 4c10229a6..f46fc5882 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -3,10 +3,12 @@ Pyramid cookiecutters ===================== -.. versionadded:: 1.8 +.. versionadded:: 1.10 A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters ` (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 Pyramid cookiecutter has replaced the now deprecated Pyramid scaffolds, and should be used going forward and can be found here: * `pyramid-cookiecutter-theonecc `_ -- cgit v1.2.3 From dfd0697dca6b0431b7d8398d93169c57be5b316b Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 13:43:52 -0700 Subject: cookiecutter version history --- docs/narr/cookiecutters.rst | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index f46fc5882..aea118e2c 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -3,7 +3,16 @@ Pyramid cookiecutters ===================== +.. versionadded:: 1.8 + Added cookiecutter support. + .. versionadded:: 1.10 + Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``. + +.. deprecated:: 1.10 + Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``. + ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported. + Use ``pyramid-cookiecutter-starter`` going forward. A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters ` (project templates), e.g., creating a Python package project from a Python package project template. -- cgit v1.2.3 From 28e688f1a41215cb6167f8e53de017ddb82b552f Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 13:49:04 -0700 Subject: name change --- docs/narr/cookiecutters.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index aea118e2c..4af7b8df0 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -16,11 +16,11 @@ Pyramid cookiecutters A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters ` (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 `_ +* `pyramid-cookiecutter-starter `_ .. seealso:: -- cgit v1.2.3 From 66af8f6bc9ead0ad09ca2718131c2dee15352283 Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 15:16:52 -0700 Subject: doc fixes --- docs/narr/cookiecutters.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index 4af7b8df0..b4fc2ada7 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -3,14 +3,13 @@ Pyramid cookiecutters ===================== -.. versionadded:: 1.8 +.. versionchanged:: 1.8 Added cookiecutter support. .. versionadded:: 1.10 Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``. .. deprecated:: 1.10 - Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``. ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported. Use ``pyramid-cookiecutter-starter`` going forward. -- cgit v1.2.3 From 2da2fec698641780a74a039f8abdafeffdb49b0c Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 15:39:34 -0700 Subject: fix typo --- docs/narr/cookiecutters.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index b4fc2ada7..9b4b7eeac 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -3,10 +3,10 @@ Pyramid cookiecutters ===================== -.. versionchanged:: 1.8 +.. versionadded:: 1.8 Added cookiecutter support. -.. versionadded:: 1.10 +.. versionchanged:: 1.10 Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``. .. deprecated:: 1.10 -- cgit v1.2.3 From 2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a Mon Sep 17 00:00:00 2001 From: Stephen Martin Date: Mon, 17 Sep 2018 18:20:48 -0700 Subject: version cleanup --- docs/narr/cookiecutters.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/narr/cookiecutters.rst') diff --git a/docs/narr/cookiecutters.rst b/docs/narr/cookiecutters.rst index 9b4b7eeac..9883713cb 100644 --- a/docs/narr/cookiecutters.rst +++ b/docs/narr/cookiecutters.rst @@ -2,10 +2,18 @@ Pyramid cookiecutters ===================== +A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters ` (project templates). + +The Pyramid cookiecutter replaced the deprecated Pyramid scaffolds, and should be used going forward. + +`pyramid-cookiecutter-starter `_ .. versionadded:: 1.8 Added cookiecutter support. +.. deprecated:: 1.8 + Scaffolds may be removed in a future version of Pyramid. + .. versionchanged:: 1.10 Merged features from ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` into the single cookiecutter to rule them all, ``pyramid-cookiecutter-starter``. @@ -13,14 +21,6 @@ Pyramid cookiecutters ``pyramid-cookiecutter-alchemy`` and ``pyramid-cookiecutter-zodb`` are no longer supported. Use ``pyramid-cookiecutter-starter`` going forward. -A :term:`cookiecutter` is a command-line utility that creates projects from :ref:`cookiecutters ` (project templates), e.g., creating a Python package project from a Python package project template. - -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-starter `_ - .. seealso:: See also `Cookiecutter Installation `_ and `Cookiecutter Features `_. Development of cookiecutters is documented under `Learn the Basics of Cookiecutter by Creating a Cookiecutter `_. -- cgit v1.2.3