diff options
| author | Benoit Pierre <benoit.pierre@gmail.com> | 2017-07-14 08:49:23 +0200 |
|---|---|---|
| committer | Benoit Pierre <benoit.pierre@gmail.com> | 2017-07-15 03:17:27 +0200 |
| commit | bf20d881df662da30d94687efb2ff3d3ba32f55a (patch) | |
| tree | 6fae2f50d6a3a2ca3d2092606aea0c008581ad81 | |
| parent | 1eec02038d28506a42bc45d14ef2d54b136cc8bc (diff) | |
| download | python-setuptools-git-bf20d881df662da30d94687efb2ff3d3ba32f55a.tar.gz | |
tests: switch back to mock instead of backports.unittest_mock
| -rw-r--r-- | pkg_resources/tests/test_markers.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_build_clib.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_msvc.py | 2 | ||||
| -rw-r--r-- | tests/requirements.txt | 3 |
5 files changed, 5 insertions, 6 deletions
diff --git a/pkg_resources/tests/test_markers.py b/pkg_resources/tests/test_markers.py index 9306d5b3..15a3b499 100644 --- a/pkg_resources/tests/test_markers.py +++ b/pkg_resources/tests/test_markers.py @@ -1,4 +1,4 @@ -from unittest import mock +import mock from pkg_resources import evaluate_marker diff --git a/setuptools/tests/test_build_clib.py b/setuptools/tests/test_build_clib.py index 7e3d1de9..aebcc350 100644 --- a/setuptools/tests/test_build_clib.py +++ b/setuptools/tests/test_build_clib.py @@ -2,7 +2,7 @@ import pytest import os import shutil -from unittest import mock +import mock from distutils.errors import DistutilsSetupError from setuptools.command.build_clib import build_clib from setuptools.dist import Distribution diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 1b7178a1..26cdd90d 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -14,7 +14,7 @@ import itertools import distutils.errors import io import zipfile -from unittest import mock +import mock import time from setuptools.extern.six.moves import urllib diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py index fbeed1d5..32d7a907 100644 --- a/setuptools/tests/test_msvc.py +++ b/setuptools/tests/test_msvc.py @@ -5,7 +5,7 @@ Tests for msvc support module. import os import contextlib import distutils.errors -from unittest import mock +import mock import pytest diff --git a/tests/requirements.txt b/tests/requirements.txt index 6e2e78e2..ddba6cc8 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,3 @@ +mock pytest-flake8 pytest>=3.0.2 -# pinned to 1.2 as temporary workaround for #1038 -backports.unittest_mock>=1.2,<1.3 |