summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-27 19:34:40 -0800
committerChris McDonough <chrism@plope.com>2012-11-27 19:34:40 -0800
commita0957885b2d7bc7609fb90d8e95e551ad90bd85b (patch)
tree1e369a630b0a68fe1d84e31f375dc623af9c46e8 /docs/tutorials
parentfb30e2cb79490f9dcafaea3d5ce2c0af140eae71 (diff)
parent02d18abdc79a727b1e148dc8718a9c15fe613be0 (diff)
downloadpyramid-a0957885b2d7bc7609fb90d8e95e551ad90bd85b.tar.gz
pyramid-a0957885b2d7bc7609fb90d8e95e551ad90bd85b.tar.bz2
pyramid-a0957885b2d7bc7609fb90d8e95e551ad90bd85b.zip
Merge pull request #732 from ppaez/transaction-dependency
Transaction dependency in ZODB tutorial
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki/src/authorization/setup.py1
-rw-r--r--docs/tutorials/wiki/src/basiclayout/setup.py1
-rw-r--r--docs/tutorials/wiki/src/models/setup.py1
-rw-r--r--docs/tutorials/wiki/src/tests/setup.py1
-rw-r--r--docs/tutorials/wiki/src/views/setup.py1
-rw-r--r--docs/tutorials/wiki/tests.rst2
6 files changed, 6 insertions, 1 deletions
diff --git a/docs/tutorials/wiki/src/authorization/setup.py b/docs/tutorials/wiki/src/authorization/setup.py
index ac8cdf2d5..1d2d690fc 100644
--- a/docs/tutorials/wiki/src/authorization/setup.py
+++ b/docs/tutorials/wiki/src/authorization/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
requires = [
'pyramid',
'pyramid_zodbconn',
+ 'transaction',
'pyramid_tm',
'pyramid_debugtoolbar',
'ZODB3',
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index c4a9067b6..647c3a638 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
requires = [
'pyramid',
'pyramid_zodbconn',
+ 'transaction',
'pyramid_tm',
'pyramid_debugtoolbar',
'ZODB3',
diff --git a/docs/tutorials/wiki/src/models/setup.py b/docs/tutorials/wiki/src/models/setup.py
index c4a9067b6..647c3a638 100644
--- a/docs/tutorials/wiki/src/models/setup.py
+++ b/docs/tutorials/wiki/src/models/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
requires = [
'pyramid',
'pyramid_zodbconn',
+ 'transaction',
'pyramid_tm',
'pyramid_debugtoolbar',
'ZODB3',
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index b7e0a8935..a665611bd 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
requires = [
'pyramid',
'pyramid_zodbconn',
+ 'transaction',
'pyramid_tm',
'pyramid_debugtoolbar',
'ZODB3',
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index ac8cdf2d5..1d2d690fc 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/setup.py
@@ -9,6 +9,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
requires = [
'pyramid',
'pyramid_zodbconn',
+ 'transaction',
'pyramid_tm',
'pyramid_debugtoolbar',
'ZODB3',
diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index ebb4d93dc..46d009d0f 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -62,7 +62,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``.
.. literalinclude:: src/tests/setup.py
:linenos:
:language: python
- :lines: 9-18
+ :lines: 9-19
After we've added a dependency on WebTest in ``setup.py``, we need to rerun
``setup.py develop`` to get WebTest installed into our virtualenv. Assuming