Bump version and update changelog

marshmallow-code · Oct 4, 2015 · d1e5d38 · d1e5d38
1 parent 0c843dc
commit d1e5d38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,7 +1,7 @@
 Changelog
 ---------
 
-0.18.0 (unreleased)
+0.18.0 (2015-10-04)
 *******************
 
 Features:
@@ -11,6 +11,8 @@ Features:
 * ``TornadoParser`` will parse json with ``simplejson`` if it is installed.
 * ``BottleParser`` caches parsed json per-request for improved performance.
 
+No breaking changes. Yay!
+
 0.17.0 (2015-09-29)
 *******************
 

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@ def read(fname):
     version=__version__,
     description=('A friendly library for parsing HTTP request arguments, '
         'with built-in support for popular web frameworks, including '
-        'Flask, Django, Bottle, Tornado, Pyramid, and webapp2.'),
+        'Flask, Django, Bottle, Tornado, Pyramid, webapp2, and Falcon.'),
     long_description=read("README.rst"),
     author='Steven Loria',
     author_email='sloria1@gmail.com',

diff --git a/webargs/__init__.py b/webargs/__init__.py
@@ -6,7 +6,7 @@
 from webargs.core import argmap2schema, WebargsError, ValidationError
 from webargs import fields
 
-__version__ = '0.18.0dev'
+__version__ = '0.18.0'
 __author__ = 'Steven Loria'
 __license__ = 'MIT'