Merge branch 'main' into mh-add-problem-matchers

quantumlib · Mar 7, 2025 · 5b2731e · 5b2731e
2 parents 96ee166 + 34b9c81
commit 5b2731e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,17 +10,19 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteract
 
 # Configure UTF-8 encoding.
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
-ENV LC_ALL en_US.UTF-8 
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 
 # Make python3 default
 RUN rm -f /usr/bin/python \
      && ln -s /usr/bin/python3 /usr/bin/python
 #cirq stable image
 FROM cirq_base AS cirq_stable
-RUN pip3 install cirq
+# TODO: adjust after the fix of https://github.com/rigetti/qcs-sdk-rust/issues/531
+RUN pip3 install cirq "qcs-sdk-python<=0.21.12"
 
 ##cirq pre_release image
 FROM cirq_base AS cirq_pre_release
-RUN pip3 install cirq~=1.0.dev
+# TODO: adjust after the fix of https://github.com/rigetti/qcs-sdk-rust/issues/531
+RUN pip3 install cirq~=1.0.dev "qcs-sdk-python<=0.21.12"
diff --git a/README.md b/README.md
@@ -166,7 +166,7 @@ develop quantum programs for a variety of applications.
 
 [Qualtran]: https://github.com/quantumlib/qualtran
 [qsim]: https://github.com/quantumlib/qsim
-[Stim]: https://github.com/quantumlib/ssim
+[Stim]: https://github.com/quantumlib/stim
 [OpenFermion]: https://github.com/quantumlib/openfermion
 [OpenFermion-FQE]: https://github.com/quantumlib/OpenFermion-FQE
 [OpenFermion-PySCF]: https://github.com/quantumlib/OpenFermion-PySCF

diff --git a/cirq-core/cirq/transformers/gauge_compiling/cphase_gauge_test.py b/cirq-core/cirq/transformers/gauge_compiling/cphase_gauge_test.py
@@ -20,28 +20,23 @@
 class TestCPhaseGauge_0_3(GaugeTester):
     two_qubit_gate = cirq.CZ**0.3
     gauge_transformer = CPhaseGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestCPhaseGauge_m0_3(GaugeTester):
     two_qubit_gate = cirq.CZ ** (-0.3)
     gauge_transformer = CPhaseGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestCPhaseGauge_0_1(GaugeTester):
     two_qubit_gate = cirq.CZ**0.1
     gauge_transformer = CPhaseGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestCPhaseGauge_m0_1(GaugeTester):
     two_qubit_gate = cirq.CZ ** (-0.1)
     gauge_transformer = CPhaseGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestCPhaseGauge_0_7(GaugeTester):
     two_qubit_gate = cirq.CZ**0.7
     gauge_transformer = CPhaseGaugeTransformer
-    sweep_must_pass = True
diff --git a/cirq-core/cirq/transformers/gauge_compiling/cz_gauge_test.py b/cirq-core/cirq/transformers/gauge_compiling/cz_gauge_test.py
@@ -21,4 +21,3 @@
 class TestCZGauge(GaugeTester):
     two_qubit_gate = cirq.CZ
     gauge_transformer = CZGaugeTransformer
-    sweep_must_pass = True
diff --git a/cirq-core/cirq/transformers/gauge_compiling/spin_inversion_gauge_test.py b/cirq-core/cirq/transformers/gauge_compiling/spin_inversion_gauge_test.py
@@ -20,22 +20,18 @@
 class TestSpinInversionGauge_0(GaugeTester):
     two_qubit_gate = cirq.ZZ
     gauge_transformer = SpinInversionGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestSpinInversionGauge_1(GaugeTester):
     two_qubit_gate = cirq.ZZ**0.1
     gauge_transformer = SpinInversionGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestSpinInversionGauge_2(GaugeTester):
     two_qubit_gate = cirq.ZZ**-1
     gauge_transformer = SpinInversionGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestSpinInversionGauge_3(GaugeTester):
     two_qubit_gate = cirq.ZZ**0.3
     gauge_transformer = SpinInversionGaugeTransformer
-    sweep_must_pass = True
diff --git a/cirq-core/cirq/transformers/gauge_compiling/sqrt_cz_gauge_test.py b/cirq-core/cirq/transformers/gauge_compiling/sqrt_cz_gauge_test.py
@@ -20,10 +20,8 @@
 class TestSqrtCZGauge(GaugeTester):
     two_qubit_gate = cirq.CZ**0.5
     gauge_transformer = SqrtCZGaugeTransformer
-    sweep_must_pass = True
 
 
 class TestAdjointSqrtCZGauge(GaugeTester):
     two_qubit_gate = cirq.CZ**-0.5
     gauge_transformer = SqrtCZGaugeTransformer
-    sweep_must_pass = True
diff --git a/cirq-rigetti/requirements.txt b/cirq-rigetti/requirements.txt
@@ -1 +1,4 @@
 pyquil>=4.14.3,<5.0.0
+
+# TODO: remove after the fix of https://github.com/rigetti/qcs-sdk-rust/issues/531
+qcs-sdk-python<=0.21.12
diff --git a/dev_tools/notebooks/isolated_notebook_test.py b/dev_tools/notebooks/isolated_notebook_test.py
@@ -85,6 +85,9 @@
     "jupyter",
     # assumed to be part of colab
     "seaborn~=0.12",
+    # TODO: remove after the fix of https://github.com/rigetti/qcs-sdk-rust/issues/531
+    "qcs-sdk-python<=0.21.12",
+    "numpy~=1.25",
 ]