From 075eeaa8d281ae37d8f9a08a0a9e9d9e6a15c57f Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 00:02:51 +0000 Subject: [PATCH 1/8] test lint failure --- cirq-core/cirq/ops/gate_operation_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cirq-core/cirq/ops/gate_operation_test.py b/cirq-core/cirq/ops/gate_operation_test.py index 3352694c045..c4d34ab47ba 100644 --- a/cirq-core/cirq/ops/gate_operation_test.py +++ b/cirq-core/cirq/ops/gate_operation_test.py @@ -511,6 +511,7 @@ def all_subclasses(cls): # Gates that do not satisfy the contract. # TODO(#5167): Fix this case. + exceptions = {cirq.PauliStringPhasorGate} skipped = set() From a5b4c6268f9c6eb92523e5e7a586b28fb9942eea Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 00:07:05 +0000 Subject: [PATCH 2/8] try fixing dill --- dev_tools/requirements/deps/dev-tools.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev_tools/requirements/deps/dev-tools.txt b/dev_tools/requirements/deps/dev-tools.txt index 339962cd097..358cdf8647f 100644 --- a/dev_tools/requirements/deps/dev-tools.txt +++ b/dev_tools/requirements/deps/dev-tools.txt @@ -15,3 +15,6 @@ qiskit-aer~=0.9.1 # For verifying rst rstcheck~=3.3.1 + +# Lint bug +dill=0.3.4 \ No newline at end of file From df5e17b81e21e69e98dfdc86506fd1ebf72a982d Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 00:09:11 +0000 Subject: [PATCH 3/8] more equals --- dev_tools/requirements/deps/dev-tools.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_tools/requirements/deps/dev-tools.txt b/dev_tools/requirements/deps/dev-tools.txt index 358cdf8647f..3b64189e3f7 100644 --- a/dev_tools/requirements/deps/dev-tools.txt +++ b/dev_tools/requirements/deps/dev-tools.txt @@ -17,4 +17,4 @@ qiskit-aer~=0.9.1 rstcheck~=3.3.1 # Lint bug -dill=0.3.4 \ No newline at end of file +dill==0.3.4 \ No newline at end of file From b6d572d8edd1d76c17e426e43a80525ee3d5ef28 Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 00:13:56 +0000 Subject: [PATCH 4/8] move into lint --- dev_tools/requirements/deps/dev-tools.txt | 5 +---- dev_tools/requirements/deps/pylint.txt | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev_tools/requirements/deps/dev-tools.txt b/dev_tools/requirements/deps/dev-tools.txt index 3b64189e3f7..0c5cee166c7 100644 --- a/dev_tools/requirements/deps/dev-tools.txt +++ b/dev_tools/requirements/deps/dev-tools.txt @@ -14,7 +14,4 @@ asv qiskit-aer~=0.9.1 # For verifying rst -rstcheck~=3.3.1 - -# Lint bug -dill==0.3.4 \ No newline at end of file +rstcheck~=3.3.1 \ No newline at end of file diff --git a/dev_tools/requirements/deps/pylint.txt b/dev_tools/requirements/deps/pylint.txt index 68da6497593..67d5fb9e3c3 100644 --- a/dev_tools/requirements/deps/pylint.txt +++ b/dev_tools/requirements/deps/pylint.txt @@ -1,3 +1,6 @@ # for linting -pylint~=2.13.0 \ No newline at end of file +pylint~=2.13.0 + +# Downgrade dill +dill==0.3.4 From c53116654e17036b538236fe4f5aca7a69a33188 Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 00:19:08 +0000 Subject: [PATCH 5/8] clean up --- cirq-core/cirq/ops/gate_operation_test.py | 1 - dev_tools/requirements/deps/dev-tools.txt | 2 +- dev_tools/requirements/deps/pylint.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cirq-core/cirq/ops/gate_operation_test.py b/cirq-core/cirq/ops/gate_operation_test.py index c4d34ab47ba..3352694c045 100644 --- a/cirq-core/cirq/ops/gate_operation_test.py +++ b/cirq-core/cirq/ops/gate_operation_test.py @@ -511,7 +511,6 @@ def all_subclasses(cls): # Gates that do not satisfy the contract. # TODO(#5167): Fix this case. - exceptions = {cirq.PauliStringPhasorGate} skipped = set() diff --git a/dev_tools/requirements/deps/dev-tools.txt b/dev_tools/requirements/deps/dev-tools.txt index 0c5cee166c7..339962cd097 100644 --- a/dev_tools/requirements/deps/dev-tools.txt +++ b/dev_tools/requirements/deps/dev-tools.txt @@ -14,4 +14,4 @@ asv qiskit-aer~=0.9.1 # For verifying rst -rstcheck~=3.3.1 \ No newline at end of file +rstcheck~=3.3.1 diff --git a/dev_tools/requirements/deps/pylint.txt b/dev_tools/requirements/deps/pylint.txt index 67d5fb9e3c3..2f3154f65e8 100644 --- a/dev_tools/requirements/deps/pylint.txt +++ b/dev_tools/requirements/deps/pylint.txt @@ -2,5 +2,5 @@ pylint~=2.13.0 -# Downgrade dill +# Bug with dill 0.3.5, see #5383 dill==0.3.4 From 800e075c5aadac7853541f8d93502f33dea9a98d Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 01:02:33 +0000 Subject: [PATCH 6/8] try keeping protobuff less than 4 --- cirq-google/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cirq-google/requirements.txt b/cirq-google/requirements.txt index 48a10d90917..c3d06e1480b 100644 --- a/cirq-google/requirements.txt +++ b/cirq-google/requirements.txt @@ -1,3 +1,3 @@ google-api-core[grpc] >= 1.14.0, < 2.0.0dev proto-plus>=1.20.0 -protobuf>=3.13.0 +protobuf>=3.13.0,<4 From a3d5a38146014c2037cd284906b66425b78e0aab Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 01:18:04 +0000 Subject: [PATCH 7/8] remove test that is pre --- cirq-google/requirements.txt | 2 +- dev_tools/notebooks/isolated_notebook_test.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cirq-google/requirements.txt b/cirq-google/requirements.txt index c3d06e1480b..48a10d90917 100644 --- a/cirq-google/requirements.txt +++ b/cirq-google/requirements.txt @@ -1,3 +1,3 @@ google-api-core[grpc] >= 1.14.0, < 2.0.0dev proto-plus>=1.20.0 -protobuf>=3.13.0,<4 +protobuf>=3.13.0 diff --git a/dev_tools/notebooks/isolated_notebook_test.py b/dev_tools/notebooks/isolated_notebook_test.py index 9316aa7a6b9..f5cd6c1a306 100644 --- a/dev_tools/notebooks/isolated_notebook_test.py +++ b/dev_tools/notebooks/isolated_notebook_test.py @@ -54,6 +54,7 @@ 'docs/tutorials/google/visualizing_calibration_metrics.ipynb', 'docs/tutorials/google/xeb_calibration_example.ipynb', 'docs/named_topologies.ipynb', + 'docs/tutorials/educators/intro.ipynb', ] # By default all notebooks should be tested, however, this list contains exceptions to the rule From 037e109df30de981f7da2a5f5c700132b0fe1ad5 Mon Sep 17 00:00:00 2001 From: Dave Bacon Date: Fri, 20 May 2022 21:13:53 +0000 Subject: [PATCH 8/8] Keep --pre from installing protobuf 4.x --- cirq-google/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cirq-google/requirements.txt b/cirq-google/requirements.txt index 48a10d90917..3616edade5a 100644 --- a/cirq-google/requirements.txt +++ b/cirq-google/requirements.txt @@ -1,3 +1,3 @@ google-api-core[grpc] >= 1.14.0, < 2.0.0dev proto-plus>=1.20.0 -protobuf>=3.13.0 +protobuf>=3.13.0<4