Merge pull request #15 from dave-shawley/release/2.2.0

Metadata bumps for 2.2.0.
sprockets · Jan 24, 2018 · c15f6d8 · c15f6d8
2 parents 25e0e39 + a7a4481
commit c15f6d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/docs/history.rst b/docs/history.rst
@@ -1,10 +1,11 @@
 Version History
 ===============
-`Next Release`_
----------------
+`2.2.0`_ (7 Jun 2017)
+---------------------
 - Add :func:`sprockets.mixins.mediatype.content.install`.
 - Add :func:`sprockets.mixins.mediatype.content.get_settings`.
 - Deprecate :meth:`sprockets.mixins.mediatype.content.ContentSettings.from_application`.
+- Update to ietfparse 1.4.
 
 `2.1.0`_ (16 Mar 2016)
 ----------------------
@@ -47,7 +48,8 @@ Version History
 ---------------------
 - Initial Release
 
-.. _Next Release: https://github.com/sprockets/sprockets.mixins.media_type/compare/2.1.0...HEAD
+.. _Next Release: https://github.com/sprockets/sprockets.mixins.media_type/compare/2.2.0...HEAD
+.. _2.2.0: https://github.com/sprockets/sprockets.mixins.media_type/compare/2.1.0...2.2.0
 .. _2.1.0: https://github.com/sprockets/sprockets.mixins.media_type/compare/2.0.1...2.1.0
 .. _2.0.1: https://github.com/sprockets/sprockets.mixins.media_type/compare/2.0.0...2.0.1
 .. _2.0.0: https://github.com/sprockets/sprockets.mixins.media_type/compare/1.0.4...2.0.0

diff --git a/sprockets/mixins/mediatype/__init__.py b/sprockets/mixins/mediatype/__init__.py
@@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs):
     set_default_content_type = _error_closure
 
 
-version_info = (2, 1, 0)
+version_info = (2, 2, 0)
 __version__ = '.'.join(str(v) for v in version_info)
 __all__ = ['ContentMixin', 'ContentSettings', 'add_binary_content_type',
            'add_text_content_type', 'set_default_content_type',