Merge pull request #257 from python-babel/sils/nextver2.x-maintenance

Sils/nextver

4 files changed, 13 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index cfd8aaa..17c229b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,17 @@
 Babel Changelog
 ===============
 
+Version 2.2
+-----------
+
+(Bugfix/minor feature release, to be released.)
+
+- TODO
+
 Version 2.1
 -----------
 
-(bugfix release, released on September 25th 2015)
+(Bugfix/minor feature release, released on September 25th 2015)
 
 - Fix Locale.parse using ``global.dat`` incompatible types 
   (https://github.com/python-babel/babel/issues/174)
diff --git a/babel/__init__.py b/babel/__init__.py
index 8f98798..d2e5259 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@ from babel.core import UnknownLocaleError, Locale, default_locale, \
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.1.1'
+__version__ = '2.2.0.dev0'
diff --git a/setup.cfg b/setup.cfg
index d1e7027..38a441d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [aliases]
-release = egg_info -RDb ''
+release = sdist bdist_wheel
 
 [pytest]
 norecursedirs = .* _* scripts {args}
diff --git a/setup.py b/setup.py
index 567849e..1a111f1 100755
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,8 @@ import sys
 import subprocess
 from setuptools import setup
 
+from babel import __version__
+
 sys.path.append(os.path.join('doc', 'common'))
 try:
     from doctools import build_doc, test_doc
@@ -32,7 +34,7 @@ class import_cldr(Command):
 
 setup(
     name='Babel',
-    version='2.1.1',
+    version=__version__,
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",