Skip to content

Commit

Permalink
Use built-in unittest.mock (#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpharrigan authored Jan 3, 2019
1 parent 1f242c3 commit dc6bf6e
Show file tree
Hide file tree
Showing 16 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion grove/tests/amplification/test_grover.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/bernstein_vazirani/test_bernstein_vazirani.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion grove/tests/circuit_primitives/test_swap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion grove/tests/deutsch_jozsa/test_deutsch_jozsa.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion grove/tests/ising/test_ising.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/jordan_gradient/test_jordan_gradient.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion grove/tests/measurements/test_estimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/pyqaoa/test_maxcut.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/pyqaoa/test_qaoa.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/pyvqe/test_algorithms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/simon/test_simon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions grove/tests/tomography/test_process_tomography.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions grove/tests/tomography/test_state_tomography.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion grove/tests/tomography/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jupyter_contrib_nbextensions
# test dependencies
tox
pytest >= 3.0.0
mock
pytest-cov
codeclimate-test-reporter

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
tests_require=[
'tox',
'pytest >= 3.0.0',
'mock'
],
license='LICENSE',
keywords='quantum quil programming hybrid'
Expand Down

0 comments on commit dc6bf6e

Please sign in to comment.