0e07c5e293
We had these differences in requirements: - mox in 2.x vs mox3 in 3.x: mox3 works for 2.x as well, so use it everywhere, mox3 version bumped to match global-requirements; - mock in 2.x, absent in 3.x (in stdlib): it's installable on 3.x, so we can leave it in requirements; - six in 2.x, absent in 3.x: is directly required by this lib, has been installed indirectly through hacking. test-requirements files were identical. This change allows us to build universal wheels and avoid confusion, see ML: http://lists.openstack.org/pipermail/openstack-dev/2014-September/044663.html Change-Id: I8bd2d561bf966c6dc1394a7d29d26f056d162fa9
18 lines
710 B
Python
18 lines
710 B
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import six
|
|
|
|
|
|
six.add_move(six.MovedModule('mock', 'mock', 'unittest.mock'))
|
|
six.add_move(six.MovedModule('mox', 'mox3.mox', 'mox3.mox'))
|