Revert "Only install mock on Python < 3.3"

This reverts commit 2487312893d4401cd69bdc015e67a448183b78bf.

Several projects are affected by the conditional install of the
mock module. The namespace in py34 is "unittest.mock" not just
"mock".

Some projects unaffected are because mock is installed via a
dependency of oslotests.

Closes-Bug: #1544377

Change-Id: I13bbd81acc4b702c59247612e8833009002e9825
This commit is contained in:
Eric Brown 2016-02-11 00:41:37 +00:00
parent 2487312893
commit 74f94beafe

View File

@ -282,7 +282,7 @@ kafka-python>=0.9.2 # Apache-2.0
keyring>=5.5.1 # MIT/PSF
ldappool>=1.0;python_version=='2.7' # MPL
mimic>=2.0.0 # Apache-2.0
mock>=1.2;python_version<'3.3' # BSD
mock>=1.2 # BSD
mox>=0.5.3 # Apache-2.0
mox3>=0.7.0 # Apache-2.0
MySQL-python;python_version=='2.7' # GPL