Cleanup version number handling.

docs/index.txt

@@ -132,6 +132,9 @@ Python 2.7 or higher.
 Releasing
 =========
 
+NB: please use semver. Bump the major component on API breaks, minor on all
+non-bugfix changes, patch on bugfix only changes.
+
 1. tag -s, push --tags origin master
 2. setup.py sdist bdist_wheel upload -s
 

mock/mock.py

@@ -35,6 +35,8 @@
 from __future__ import absolute_import
 
 __all__ = (
+    '__version__',
+    'version_info',
     'Mock',
     'MagicMock',
     'patch',
@@ -52,9 +54,6 @@
 )
 
 
-__version__ = '1.1.0dev1'
-
-
 from functools import partial
 import inspect
 import pprint
@@ -67,6 +66,11 @@
 
 import six
 from six import wraps
+from pbr.version import VersionInfo
+
+_v = VersionInfo('mock').semantic_version()
+__version__ = _v.release_string()
+version_info = _v.version_tuple()
 
 import mock
 

requirements.txt

@@ -1,2 +1,6 @@
 funcsigs;python_version<"3.3"
+# For runtime needs this is correct. For setup_requires needs, 1.2.0 is needed
+# but setuptools can't cope with conflicts in setup_requires, so thats
+# unversioned.
+pbr>=0.11
 six