Imported Upstream version 3.0.1

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e2fb72b..1672271 100644 (file)
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+3.0.1
+-----
+
+- Fix packaging issue where ``six`` was missed as a dependency.
+
 3.0.0
 -----
 

diff --git a/mock/mock.py b/mock/mock.py
index 12ec7bf..3011662 100644 (file)
--- a/mock/mock.py
+++ b/mock/mock.py
@@ -68,7 +68,7 @@ from unittest.util import safe_repr
 import six
 from six import wraps
 
-__version__ = '3.0.0'
+__version__ = '3.0.1'
 version_info = tuple(int(p) for p in __version__.split('.'))
 
 import mock

diff --git a/setup.cfg b/setup.cfg
index b3e33a9..57c62a1 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,6 +29,7 @@ keyword =
     testing, test, mock, mocking, unittest, patching, stubs, fakes, doubles
 
 [options]
+install_requires=six
 python_requires=>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
 packages = mock