Qiskit v0.20 (#101)

* Removing the now supported CU1 gate and adjusting the number of entries in the record

* Pinning to Qiskit >=0.20

* Monkeypatch IBMQX_TOKEN

requirements.txt

@@ -1,4 +1,4 @@
-qiskit>=0.19.1
+qiskit>=0.20
 pennylane>=0.9.0
 numpy
 networkx>=2.2;python_version>'3.5'

setup.py

@@ -22,7 +22,7 @@
     long_description = fh.read()
 
 requirements = [
-    "qiskit>=0.19.1",
+    "qiskit>=0.20",
     "pennylane>=0.9.0",
     "numpy",
     "networkx>=2.2;python_version>'3.5'",

tests/test_converter.py

@@ -761,14 +761,8 @@ class TestConverterQasm:
                'x q[2];' \
                'barrier q;' \
                'h q[0];' \
-               'cu1(pi/2) q[1],q[0];' \
                'h q[1];' \
-               'cu1(pi/4) q[2],q[0];' \
-               'cu1(pi/2) q[2],q[1];' \
                'h q[2];' \
-               'cu1(pi/8) q[3],q[0];' \
-               'cu1(pi/4) q[3],q[1];' \
-               'cu1(pi/2) q[3],q[2];' \
                'h q[3];' \
                'measure q -> c;'
 
@@ -812,16 +806,13 @@ def test_qasm_from_file(self, tmpdir, recorder):
         assert recorder.queue[5].parameters == []
         assert recorder.queue[5].wires == Wires([3])
 
-        assert len(record) == 11
+        assert len(record) == 5
         # check that the message matches
         assert record[0].message.args[0] == "pennylane_qiskit.converter: The {} instruction is not supported by" \
                                             " PennyLane, and has not been added to the template."\
             .format('Barrier')
         assert record[1].message.args[0] == "pennylane_qiskit.converter: The {} instruction is not supported by" \
                                             " PennyLane, and has not been added to the template."\
-            .format('CU1Gate')
-        assert record[7].message.args[0] == "pennylane_qiskit.converter: The {} instruction is not supported by" \
-                                            " PennyLane, and has not been added to the template."\
             .format('Measure')
 
     def test_qasm_file_not_found_error(self):

tests/test_ibmq.py

@@ -114,11 +114,13 @@ def test_load_from_disk(token):
     IBMQ.delete_account()
 
 
-def test_account_error():
+def test_account_error(monkeypatch):
 
     # Token is passed such that the test is skipped if no token was provided
     with pytest.raises(IBMQAccountError, match="No active IBM Q account"):
-        IBMQDevice(wires=1)
+        with monkeypatch.context() as m:
+            m.delenv("IBMQX_TOKEN", raising=False)
+            IBMQDevice(wires=1)
 
 
 @pytest.mark.parametrize("analytic", [False])