Merge pull request #103 from nicoddemus/mock-req-101

Fix mock requirements for py2

Author: nicoddemus

CHANGELOG.rst

@@ -1,3 +1,11 @@
+1.7.1
+-----
+
+* Fix ``mock`` requirements in Python 2. Thanks `@ghisvail`_ for the report.
+
+.. _@ghisvail: https://github.com/ghisvail
+.. _#101: https://github.com/pytest-dev/pytest-mock/issues/101
+
 1.7.0
 -----
 

setup.py

@@ -11,10 +11,8 @@
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     install_requires=[
         'pytest>=2.7',
+        'mock;python_version<"3.0"',
     ],
-    extras_require={
-        ':python_version=="2.7"': ['mock'],
-    },
     use_scm_version={'write_to': '_pytest_mock_version.py'},
     setup_requires=['setuptools_scm'],
     url='https://github.com/pytest-dev/pytest-mock/',