From 878d8d1d0c2cc7e8a9adb534dfba5fed98e9543e Mon Sep 17 00:00:00 2001
From: Andreas Kaiser <disko@binary-punks.com>
Date: Mon, 20 Feb 2017 20:18:33 +0100
Subject: [PATCH] Upgrade requirements.

---
 requirements.txt | 33 +++++++++++++++++----------------
 setup.py         |  6 ++++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7062c2142..e1e33f6cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,14 @@
-alembic==0.8.9
+alembic==0.8.10
 appdirs==1.4.0
 Babel==2.3.4
 Beaker==1.8.1
-bleach-whitelist==0.0.7
 bleach==1.5.0
 Chameleon==3.0
-colander==1.2
-deform==2.0.3
+colander==1.3.2
+deform==2.0.4
 docopt==0.6.2
 fanstatic==1.0a7
-filedepot==0.4.0
+filedepot==0.4.1
 FormEncode==2.0.0a1
 funcsigs==1.0.2
 html2text==2016.9.19
@@ -20,37 +19,38 @@ js.bootstrap==3.3.4
 js.deform==2.0.3
 js.fineuploader==3.3.0
 js.html5shiv==3.7.3
+js.jquery==1.9.1
 js.jquery-form==3.9
 js.jquery-maskedinput==1.3.1
 js.jquery-maskmoney==1.4.1
 js.jquery-sortable==0.9.12
 js.jquery-tablednd==0.4
 js.jquery-timepicker-addon==1.5.3
-js.jquery==1.9.1
-js.jqueryui-tagit==2.0.24.post2
 js.jqueryui==1.10.3
+js.jqueryui-tagit==2.0.24.post2
 js.modernizr==2.5.3.1
 js.select2==3.4.1
 js.tinymce==4.2.7
 kotti-image==0.1.4
 LEPL==5.1.3
-lingua==4.11
+lingua==4.13
+lxml==3.7.2
 Mako==1.0.6
 MarkupSafe==0.23
 PasteDeploy==1.5.2
 peppercorn==0.5
-Pillow==3.4.2
+Pillow==4.0.0
 plone.scale==2.1
 polib==1.0.8
 py-bcrypt==0.4
+pyramid==1.7.4
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
 pyramid-mailer==0.15.1
 pyramid-tm==1.1.1
 pyramid-zcml==1.0.0
-pyramid==1.7.3
-python-editor==1.0.1
+python-editor==1.0.3
 pytz==2016.10
 repoze.lru==0.6
 repoze.sendmail==4.3
@@ -58,15 +58,16 @@ repoze.workflow==1.0b1
 repoze.zcml==1.0b1
 rfc6266==0.0.4
 six==1.10.0
+SQLAlchemy==1.1.5
 SQLAlchemy-Utils==0.32.12
-SQLAlchemy==1.1.4
-transaction==2.0.3
+transaction==2.1.0
 translationstring==1.3
-Unidecode==0.4.19
+Unidecode==0.4.20
 usersettings==1.0.7
 venusian==1.0
-waitress==1.0.1
-WebOb==1.7.0
+waitress==1.0.2
+WebOb==1.7.1
+zope.cachedescriptors==4.2.0
 zope.component==4.3.0
 zope.configuration==4.0.3
 zope.deprecation==4.2.0
diff --git a/setup.py b/setup.py
index 92cfd4b3a..e994e3b2a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
     'alembic>=0.8.0',
     'bleach',
     'bleach-whitelist',
-    'colander<1.3',  # until https://github.com/Pylons/colander/pull/272 is merged and released  # noqa
+    'colander>=1.3.2',
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
     'docopt',
     'fanstatic>=1.0a7',
@@ -45,7 +45,9 @@
     'kotti_image',
     'lingua>=1.3',
     'py_bcrypt',
-    'pyramid>=1.5',  # needed for ``request.has_permission``
+    'pyramid>=1.5<1.8',  # needed for ``request.has_permission``,
+    # pyramid_zcml isn't compatible with pyramid 1.8 yet.
+    # see https://github.com/Pylons/pyramid_zcml/pull/23
     'pyramid_beaker',
     'pyramid_chameleon',
     'pyramid_deform>=0.2a3',  # language and template path config includeme