summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDick Marinus <dick@mrns.nl>2021-04-23 21:27:24 +0200
committerDick Marinus <dick@mrns.nl>2021-04-23 21:27:24 +0200
commit4114bcf90d888357e3adc4de108988c606fbb32e (patch)
tree83099f0aa88d735e4c98725b10abbb47a94a13ea
parent96e6c951f221d10be27d95fc5fbcdc8ce3710a7b (diff)
deprecate python mock
-rw-r--r--changelog.md4
-rw-r--r--requirements-dev.txt1
-rw-r--r--test/test_completion_refresher.py2
-rw-r--r--test/test_naive_completion.py2
-rw-r--r--test/test_smart_completion_public_schema_only.py4
-rw-r--r--test/test_special_iocommands.py2
6 files changed, 9 insertions, 6 deletions
diff --git a/changelog.md b/changelog.md
index 95e594f..18f775c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -10,6 +10,10 @@ Bug Fixes:
---------
* Restore dependency on cryptography for the interactive password prompt
+Internal:
+---------
+* Deprecate Python mock
+
1.24.0
======
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7a38ed5..9c40316 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,3 @@
-mock
pytest!=3.3.0
pytest-cov==2.4.0
tox
diff --git a/test/test_completion_refresher.py b/test/test_completion_refresher.py
index 1ed6377..cdc2fb5 100644
--- a/test/test_completion_refresher.py
+++ b/test/test_completion_refresher.py
@@ -1,6 +1,6 @@
import time
import pytest
-from mock import Mock, patch
+from unittest.mock import Mock, patch
@pytest.fixture
diff --git a/test/test_naive_completion.py b/test/test_naive_completion.py
index 14c1bf5..32b2abd 100644
--- a/test/test_naive_completion.py
+++ b/test/test_naive_completion.py
@@ -11,7 +11,7 @@ def completer():
@pytest.fixture
def complete_event():
- from mock import Mock
+ from unittest.mock import Mock
return Mock()
diff --git a/test/test_smart_completion_public_schema_only.py b/test/test_smart_completion_public_schema_only.py
index b66c696..e7d460a 100644
--- a/test/test_smart_completion_public_schema_only.py
+++ b/test/test_smart_completion_public_schema_only.py
@@ -1,5 +1,5 @@
import pytest
-from mock import patch
+from unittest.mock import patch
from prompt_toolkit.completion import Completion
from prompt_toolkit.document import Document
import mycli.packages.special.main as special
@@ -35,7 +35,7 @@ def completer():
@pytest.fixture
def complete_event():
- from mock import Mock
+ from unittest.mock import Mock
return Mock()
diff --git a/test/test_special_iocommands.py b/test/test_special_iocommands.py
index 73bfbab..8b6be33 100644
--- a/test/test_special_iocommands.py
+++ b/test/test_special_iocommands.py
@@ -2,7 +2,7 @@ import os
import stat
import tempfile
from time import time
-from mock import patch
+from unittest.mock import patch
import pytest
from pymysql import ProgrammingError