diff --git a/grove/tests/amplification/test_grover.py b/grove/tests/amplification/test_grover.py index f8f65e9..24f2d85 100644 --- a/grove/tests/amplification/test_grover.py +++ b/grove/tests/amplification/test_grover.py @@ -1,6 +1,6 @@ import numpy as np import pytest -from mock import patch +from unittest.mock import patch from pyquil import Program from pyquil.gates import H, X from pyquil.quilatom import QubitPlaceholder diff --git a/grove/tests/bernstein_vazirani/test_bernstein_vazirani.py b/grove/tests/bernstein_vazirani/test_bernstein_vazirani.py index 538f033..74c2567 100644 --- a/grove/tests/bernstein_vazirani/test_bernstein_vazirani.py +++ b/grove/tests/bernstein_vazirani/test_bernstein_vazirani.py @@ -1,5 +1,5 @@ import numpy as np -from mock import patch +from unittest.mock import patch from grove.bernstein_vazirani.bernstein_vazirani import BernsteinVazirani, create_bv_bitmap diff --git a/grove/tests/circuit_primitives/test_swap.py b/grove/tests/circuit_primitives/test_swap.py index cabd245..7ff7531 100644 --- a/grove/tests/circuit_primitives/test_swap.py +++ b/grove/tests/circuit_primitives/test_swap.py @@ -3,7 +3,7 @@ """ import numpy as np import pytest -from mock import patch +from unittest.mock import patch from pyquil import Program from pyquil.gates import CSWAP, H diff --git a/grove/tests/deutsch_jozsa/test_deutsch_jozsa.py b/grove/tests/deutsch_jozsa/test_deutsch_jozsa.py index 51c1771..38e8ee8 100644 --- a/grove/tests/deutsch_jozsa/test_deutsch_jozsa.py +++ b/grove/tests/deutsch_jozsa/test_deutsch_jozsa.py @@ -1,6 +1,6 @@ import numpy as np import pytest -from mock import patch +from unittest.mock import patch from pyquil import Program from pyquil.gates import X, H, CNOT diff --git a/grove/tests/ising/test_ising.py b/grove/tests/ising/test_ising.py index 87065a0..558c0e1 100644 --- a/grove/tests/ising/test_ising.py +++ b/grove/tests/ising/test_ising.py @@ -1,5 +1,5 @@ import numpy as np -from mock import patch, Mock +from unittest.mock import patch, Mock from pyquil.api import WavefunctionSimulator from grove.ising.ising_qaoa import energy_value, ising diff --git a/grove/tests/jordan_gradient/test_jordan_gradient.py b/grove/tests/jordan_gradient/test_jordan_gradient.py index 528d3c2..f782534 100644 --- a/grove/tests/jordan_gradient/test_jordan_gradient.py +++ b/grove/tests/jordan_gradient/test_jordan_gradient.py @@ -1,5 +1,5 @@ import numpy as np -from mock import patch +from unittest.mock import patch from pyquil import Program from pyquil.gates import H, CPHASE, SWAP, MEASURE diff --git a/grove/tests/measurements/test_estimation.py b/grove/tests/measurements/test_estimation.py index e810433..0fd1e27 100644 --- a/grove/tests/measurements/test_estimation.py +++ b/grove/tests/measurements/test_estimation.py @@ -3,7 +3,7 @@ """ import numpy as np import pytest -from mock import Mock, patch +from unittest.mock import Mock, patch from pyquil import Program from pyquil.api import QuantumComputer from pyquil.gates import RY, RX, I diff --git a/grove/tests/pyqaoa/test_maxcut.py b/grove/tests/pyqaoa/test_maxcut.py index 3ab335c..917d34e 100644 --- a/grove/tests/pyqaoa/test_maxcut.py +++ b/grove/tests/pyqaoa/test_maxcut.py @@ -16,7 +16,7 @@ import numpy as np import pytest import pyquil.api as qc_mod -from mock import Mock, patch +from unittest.mock import Mock, patch from pyquil import Program from pyquil.gates import H, X, PHASE, CNOT, RZ from pyquil.paulis import PauliTerm, PauliSum diff --git a/grove/tests/pyqaoa/test_qaoa.py b/grove/tests/pyqaoa/test_qaoa.py index b43972f..e9cde87 100644 --- a/grove/tests/pyqaoa/test_qaoa.py +++ b/grove/tests/pyqaoa/test_qaoa.py @@ -15,7 +15,7 @@ ############################################################################## import numpy as np -from mock import Mock, patch +from unittest.mock import Mock, patch from pyquil import Program from pyquil.api import QuantumComputer, WavefunctionSimulator from pyquil.gates import X, Y, Z diff --git a/grove/tests/pyvqe/test_algorithms.py b/grove/tests/pyvqe/test_algorithms.py index a708239..ec661e7 100644 --- a/grove/tests/pyvqe/test_algorithms.py +++ b/grove/tests/pyvqe/test_algorithms.py @@ -18,7 +18,7 @@ import funcsigs import numpy as np import pytest -from mock import Mock, MagicMock, patch +from unittest.mock import Mock, MagicMock, patch from pyquil import Program from pyquil.api import WavefunctionSimulator from pyquil.gates import H, RX, RZ diff --git a/grove/tests/simon/test_simon.py b/grove/tests/simon/test_simon.py index c59abf5..a403d49 100644 --- a/grove/tests/simon/test_simon.py +++ b/grove/tests/simon/test_simon.py @@ -3,7 +3,7 @@ from os.path import abspath, dirname import numpy as np -from mock import patch +from unittest.mock import patch from pyquil import Program from grove.simon.simon import Simon, create_1to1_bitmap, create_valid_2to1_bitmap diff --git a/grove/tests/tomography/test_process_tomography.py b/grove/tests/tomography/test_process_tomography.py index d177565..fe6157c 100644 --- a/grove/tests/tomography/test_process_tomography.py +++ b/grove/tests/tomography/test_process_tomography.py @@ -17,8 +17,7 @@ import pytest import os import numpy as np -from mock import patch -from mock import MagicMock, Mock +from unittest.mock import patch, MagicMock, Mock import json from pyquil.api import Job, QVMConnection diff --git a/grove/tests/tomography/test_state_tomography.py b/grove/tests/tomography/test_state_tomography.py index 6dd4507..9a3c408 100644 --- a/grove/tests/tomography/test_state_tomography.py +++ b/grove/tests/tomography/test_state_tomography.py @@ -20,8 +20,7 @@ import numpy as np import pytest -from mock import MagicMock -from mock import patch +from unittest.mock import MagicMock, patch from pyquil.api import Job, QVMConnection from grove.tomography.operator_utils import make_diagonal_povm diff --git a/grove/tests/tomography/test_utils.py b/grove/tests/tomography/test_utils.py index 41d0a7e..5dc7bf0 100644 --- a/grove/tests/tomography/test_utils.py +++ b/grove/tests/tomography/test_utils.py @@ -17,7 +17,7 @@ import numpy as np import pytest from matplotlib.pyplot import figure -from mock import Mock, patch, call +from unittest.mock import Mock, patch, call from mpl_toolkits.mplot3d import Axes3D from pyquil.api import QuantumComputer from pyquil.gates import X, Y, I diff --git a/requirements.txt b/requirements.txt index a2085f2..d238fcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,6 @@ jupyter_contrib_nbextensions # test dependencies tox pytest >= 3.0.0 -mock pytest-cov codeclimate-test-reporter diff --git a/setup.py b/setup.py index 187e570..fb540b8 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,6 @@ tests_require=[ 'tox', 'pytest >= 3.0.0', - 'mock' ], license='LICENSE', keywords='quantum quil programming hybrid'