Merge branch 'develop'

klen · Nov 16, 2016 · a1847c2 · a1847c2
2 parents 3311af0 + 1af6c4b
commit a1847c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
-current_version = 5.6.1
+current_version = 5.6.2
 files = mixer/__init__.py
 tag = True
 tag_name = {new_version}

diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ docs/_build
 /.coverage
 /.ropeproject
 /.cache
+/.python-version
diff --git a/mixer/__init__.py b/mixer/__init__.py
@@ -14,7 +14,7 @@
 # Module information
 # ==================
 
-__version__ = "5.6.1"
+__version__ = "5.6.2"
 __project__ = "mixer"
 __author__ = "horneds <horneds@gmail.com>"
 __license__ = "BSD"
diff --git a/tox.ini b/tox.ini
@@ -19,7 +19,8 @@ commands=py.test tests
 deps =
     flask-sqlalchemy
     mongoengine
-    peewee>=2.7.3
+    marshmallow
+    peewee>=2.7.5
     pytest
 
 # Django 1.9