Merge tag '2.0.0' into develop

class components * tag '2.0.0': Bump version: 1.2.0 → 2.0.0
manuphatak · Jan 1, 2016 · 26c0da4 · 26c0da4
2 parents 2af3623 + f3bc3cb
commit 26c0da4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/json_config/__init__.py b/json_config/__init__.py
@@ -22,7 +22,7 @@
 
 __author__ = 'Manu Phatak'
 __email__ = 'bionikspoon@gmail.com'
-__version__ = '1.2.0'
+__version__ = '2.0.0'
 
 import logging
 from ._compat import NullHandler

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 2.0.0
 commit = True
 tag = False
 tag_name = {new_version}
@@ -10,3 +10,4 @@ tag_name = {new_version}
 
 [wheel]
 universal = 1
+
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@ def run_tests(self):
 
 setup(  # :off
     name='json_config',
-    version='1.2.0',
+    version='2.0.0',
     description='A convenience utility for working with JSON config files.',
     long_description='\n\n'.join([readme, history]),
     author='Manu Phatak',