Merge branch 'develop' for release 0.2.4

ramses-tech · Jun 5, 2015 · 0f48017 · 0f48017
2 parents 86706cd + ada5a20
commit 0f48017
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* :release:`0.2.4 <2015-06-05>`
+* :bug:`-` Forward compatibility with nefertari releases
+
 * :release:`0.2.3 <2015-06-03>`
 * :bug:`-` Fixed password minimum length support by adding before and after validation processors
 * :bug:`-` Fixed bug with Elasticsearch indexing of nested relationships

diff --git a/setup.py b/setup.py
@@ -9,13 +9,13 @@
     'sqlalchemy_utils',
     'elasticsearch',
     'pyramid_tm',
-    'nefertari==0.3.2'
+    'nefertari>=0.3.3'
 ]
 
 
 setup(
     name='nefertari_sqla',
-    version="0.2.3",
+    version="0.2.4",
     description='sqla engine for nefertari',
     classifiers=[
         "Programming Language :: Python",