From 75c30dfe18b26ca04efae2acbe35052fa0d93ed6 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 18 Jun 2017 08:46:27 +0200
Subject: [PATCH] Merge branch 'master' into pr/3034

---
 docs/tutorials/wiki/src/basiclayout/setup.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py
index 5d1e9c7..d743c98 100644
--- a/docs/tutorials/wiki/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki/src/basiclayout/setup.py
@@ -9,9 +9,11 @@
     CHANGES = f.read()
 
 requires = [
-    'pyramid',
+    'plaster_pastedeploy',
+    'pyramid >= 1.9a',
     'pyramid_chameleon',
     'pyramid_debugtoolbar',
+    'pyramid_retry',
     'pyramid_tm',
     'pyramid_zodbconn',
     'transaction',

--
Gitblit v1.9.3