summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-06-11 12:34:43 -0500
committerGitHub <noreply@github.com>2017-06-11 12:34:43 -0500
commit06c28384c1217e054f530df511b434ff543e3132 (patch)
tree2c88d3fe196a3a594eac3d74f49b20c39d0d7aae /docs/narr
parenta503511cf82ab1db8c66eb949eeb30da92dd621f (diff)
parentfa13770dba3947ce78c2a67041cbd02272992104 (diff)
downloadpyramid-06c28384c1217e054f530df511b434ff543e3132.tar.gz
pyramid-06c28384c1217e054f530df511b434ff543e3132.tar.bz2
pyramid-06c28384c1217e054f530df511b434ff543e3132.zip
Merge pull request #3082 from stevepiercy/master
Update docs to synch with cookiecutter updates
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/myproject/setup.py1
-rw-r--r--docs/narr/testing.rst12
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/narr/myproject/setup.py b/docs/narr/myproject/setup.py
index 00e377349..153a659ba 100644
--- a/docs/narr/myproject/setup.py
+++ b/docs/narr/myproject/setup.py
@@ -9,6 +9,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
CHANGES = f.read()
requires = [
+ 'plaster_pastedeploy',
'pyramid',
'pyramid_jinja2',
'pyramid_debugtoolbar',
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst
index 406383bbd..f124ac562 100644
--- a/docs/narr/testing.rst
+++ b/docs/narr/testing.rst
@@ -376,18 +376,16 @@ following the ``requires`` block in the file ``myproject/setup.py``.
.. literalinclude:: myproject/setup.py
:language: python
- :linenos:
- :lines: 11-22
- :lineno-start: 11
- :emphasize-lines: 8-
+ :lines: 11-23
+ :lineno-match:
+ :emphasize-lines: 9-
Remember to change the dependency.
.. literalinclude:: myproject/setup.py
:language: python
- :linenos:
- :lines: 40-44
- :lineno-start: 40
+ :lines: 42-46
+ :lineno-match:
:emphasize-lines: 2-4
As always, whenever you change your dependencies, make sure to run the correct