pyramid version++

ramses-tech · Feb 9, 2016 · effb2f2 · effb2f2
1 parent b0cea3e
commit effb2f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -5,6 +5,8 @@ Changelog
 * :bug:`121 major` Fixed issue with nested resources referencing a parent in their schema
 * :bug:`128` Build ES params when body provided
 * :support:`130` Added support for Elasticsearch 2.x
+* :support:`-` Added support for Pyramid 1.6.x
+* :support:`-` Scaffold defaults to Pyramid 1.6.1
 
 * :release:`0.6.1 <2015-11-18>`
 * :bug:`-` Added 'event.instance' to 'event' object to access newly created object (if object is returned by view method)

diff --git a/nefertari/scaffolds/nefertari_starter/requirements.txt b/nefertari/scaffolds/nefertari_starter/requirements.txt
@@ -2,7 +2,7 @@ nefertari
 
 cryptacular==1.4.1
 Paste==2.0.2
-pyramid
+pyramid==1.6.1
 waitress==0.8.9
 
 -e .
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 VERSION = open(os.path.join(here, 'VERSION')).read()
 
 install_requires = [
-    'pyramid==1.5.7',
+    'pyramid',
     'tempita',
     'requests',
     'simplejson',