Merge pull request #3107 from deinok/requirements-upgrades

Requirements upgrades

requirements.in

@@ -1,35 +1,35 @@
 # The file contains the direct ckan requirements.
 # Use pip-compile to create a requirements.txt file from this
 Babel==2.3.4
-Jinja2==2.8
-Pylons==0.9.7
-Beaker==1.7.0 # need to pin this because of https://github.com/bbangert/beaker/commit/fc511ceda4305fcf54919b3f081fed7790e2fef3
-bleach==1.4.2
-WebTest==1.4.3  # need to pin this so that Pylons does not install a newer version that conflicts with WebOb==1.0.8
+Beaker==1.8.0 # Needs to be pinned to a more up to date version than the Pylons one
+bleach==1.4.3
 fanstatic==0.12
-Markdown==2.4
-ofs==0.4.1
+Flask==0.10.1
+Jinja2==2.8
+Markdown==2.6.6
+ofs==0.4.2
 ordereddict==1.1
 Pairtree==0.7.1-T
+passlib==1.6.5
 paste==1.7.5.1
-passlib==1.6.2
 psycopg2==2.4.5
-pysolr==3.4.0
+pysolr==3.5.0
+Pylons==0.9.7
 python-dateutil>=1.5.0,<2.0.0
-pyutilib.component.core==4.5.3
+pytz==2016.4
+pyutilib.component.core==4.6.4
 repoze.who-friendlyform==1.0.8
-repoze.who==2.0
-requests==2.7.0
+repoze.who==2.3
+requests==2.10.0
 Routes==1.13
-sqlalchemy-migrate==0.9.1
+sqlalchemy-migrate==0.10.0
 SQLAlchemy==0.9.6
+sqlparse==0.1.19
+tzlocal==1.2.2
+unicodecsv>=0.9
 vdm==0.13
-sqlparse==0.1.11
 WebHelpers==1.3
 WebOb==1.0.8
-zope.interface==4.1.1
-unicodecsv>=0.9
-pytz==2016.4
-tzlocal==1.2.2
+WebTest==1.4.3  # need to pin this so that Pylons does not install a newer version that conflicts with WebOb==1.0.8
 wsgi-party==0.1b1
-Flask==0.10.1
+zope.interface==4.2.0

requirements.txt

@@ -6,55 +6,55 @@
 #
 argparse==1.4.0           # via ofs
 Babel==2.3.4
-Beaker==1.7.0
-bleach==1.4.2
+Beaker==1.8.0
+bleach==1.4.3
 decorator==4.0.6          # via pylons, sqlalchemy-migrate
 fanstatic==0.12
 Flask==0.10.1
 FormEncode==1.3.0
 html5lib==0.9999999       # via bleach
 itsdangerous==0.24        # via flask
 Jinja2==2.8
-Mako==1.0.3
-Markdown==2.4
+Mako==1.0.4
+Markdown==2.6.6
 MarkupSafe==0.23
 nose==1.3.7               # via pylons
-ofs==0.4.1
+ofs==0.4.2
 ordereddict==1.1
 Pairtree==0.7.1-T
-passlib==1.6.2
+passlib==1.6.5
 paste==1.7.5.1
 PasteDeploy==1.5.2
 PasteScript==2.0.2
 pbr==0.11.1               # via sqlalchemy-migrate
 psycopg2==2.4.5
-pysolr==3.4.0
-Pygments==2.1
+pysolr==3.5.0
+Pygments==2.1.3
 Pylons==0.9.7
 python-dateutil==1.5
 pytz==2016.4
-pyutilib.component.core==4.5.3
+pyutilib.component.core==4.6.4
 repoze.lru==0.6           # via routes
 repoze.who-friendlyform==1.0.8
-repoze.who==2.0
-requests==2.7.0
+repoze.who==2.3
+requests==2.10.0
 Routes==1.13
-simplejson==3.3.1         # via pylons HAND-FIXED FOR NOW #2681
+simplejson==3.8.2         # via pylons
 six==1.10.0               # via bleach, html5lib, pastescript, sqlalchemy-migrate
-sqlalchemy-migrate==0.9.1
+sqlalchemy-migrate==0.10.0
 SQLAlchemy==0.9.6
-sqlparse==0.1.11
+sqlparse==0.1.19
 Tempita==0.5.2
 tzlocal==1.2.2
 unicodecsv==0.14.1
 vdm==0.13
-WebError==0.11
+WebError==0.13.1
 WebHelpers==1.3
 WebOb==1.0.8
 WebTest==1.4.3
-Werkzeug==0.11.3
+Werkzeug==0.11.10
 wsgi-party==0.1b1
-zope.interface==4.1.1
+zope.interface==4.2.0
 
 # The following packages are commented out because they are
 # considered to be unsafe in a requirements file: