Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
tox
pytest-cov
pytest
mock
cherrypy
sphinx
redis
Expand Down
2 changes: 1 addition & 1 deletion tests/test_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

import mock
from unittest import mock
import pytest

from requests import Session
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cache_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Unit tests that verify our caching methods work correctly.
"""
import pytest
from mock import ANY, Mock
from unittest.mock import ANY, Mock
import time
from tempfile import mkdtemp

Expand Down
2 changes: 1 addition & 1 deletion tests/test_etag.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest

from mock import Mock, patch
from unittest.mock import Mock, patch

import requests

Expand Down
2 changes: 1 addition & 1 deletion tests/test_expires_heuristics.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from email.utils import formatdate, parsedate
from datetime import datetime

from mock import Mock
from unittest.mock import Mock
from requests import Session, get

from cachecontrol import CacheControl
Expand Down
2 changes: 1 addition & 1 deletion tests/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import msgpack
import requests

from mock import Mock
from unittest.mock import Mock

from cachecontrol.compat import pickle
from cachecontrol.serialize import Serializer
Expand Down
2 changes: 1 addition & 1 deletion tests/test_storage_redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from datetime import datetime

from mock import Mock
from unittest.mock import Mock
from cachecontrol.caches import RedisCache


Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ python =

[testenv]
deps = pytest
mock
cherrypy
redis
filelock
Expand Down