Merge pull request #10 from sprockets/release-2

Prepare for release 2.0.0
sprockets · Feb 24, 2016 · 8a381c5 · 8a381c5
2 parents dbf6ecc + a9e24b7
commit 8a381c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -28,6 +28,7 @@
     'github_banner': True,
     'travis_button': True,
     'sidebar_width': '230px',
+    'codecov_button': True,
 }
 
 intersphinx_mapping = {

diff --git a/docs/history.rst b/docs/history.rst
@@ -1,8 +1,8 @@
 Version History
 ===============
 
-`Next Release`_
----------------
+`2.0.0`_ (24 Feb 2016)
+----------------------
 - Repackage from a module into a package.  Distributing raw modules inside
   of a namespace package is unreliable and questionably correct.
 - Add :func:`sprockets.mixins.mediatype.content.add_transcoder`.
@@ -33,7 +33,8 @@ Version History
 ---------------------
 - Initial Release
 
-.. _Next Release: https://github.com/sprockets/sprockets.http/compare/1.0.4...HEAD
+.. _Next Release: https://github.com/sprockets/sprockets.http/compare/2.0.0...HEAD
+.. _2.0.0: https://github.com/sprockets/sprockets.http/compare/1.0.4...2.0.0
 .. _1.0.4: https://github.com/sprockets/sprockets.http/compare/1.0.3...1.0.4
 .. _1.0.3: https://github.com/sprockets/sprockets.http/compare/1.0.2...1.0.3
 .. _1.0.2: https://github.com/sprockets/sprockets.http/compare/1.0.1...1.0.2

diff --git a/sprockets/mixins/mediatype/__init__.py b/sprockets/mixins/mediatype/__init__.py
@@ -38,7 +38,7 @@ def wrapper(*args, **kwargs):
 ContentMixin = _mark_deprecated(ContentMixin)
 ContentSettings = _mark_deprecated(ContentSettings)
 
-version_info = (1, 0, 4)
+version_info = (2, 0, 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',