Skip to content

Commit 0f8bec3

Browse files
authored
Merge branch 'quantumlib:main' into mhucka-new-top-readme
2 parents f55479b + 26b1f46 commit 0f8bec3

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

cirq-core/cirq/study/sweeps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class ZipLongest(Zip):
403403
which uses a fixed fill value.
404404
405405
Raises:
406-
ValueError if an input sweep if completely empty.
406+
ValueError if an input sweep is completely empty.
407407
"""
408408

409409
def __init__(self, *sweeps: Sweep) -> None:

dev_tools/docs/run_doctest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,10 @@ def main():
227227

228228
file_names = glob.glob('cirq**/cirq**/**/*.py', recursive=True)
229229
assert file_names
230-
# Remove the engine client code.
231230
excluded = [
232-
'cirq-google/cirq_google/engine/client/',
233-
'cirq-google/cirq_google/cloud/',
234231
'cirq-google/cirq_google/api/',
232+
'cirq-google/cirq_google/cloud/',
233+
'cirq-web/cirq_ts/node_modules/',
235234
]
236235
file_names = [
237236
f

docs/dev/rfc_process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ a Getting Started guide).
146146
* Transformer for compiling circuits to the supported gates on the
147147
hardware (or use `cirq.optimize_for_target_gateset`)
148148
* ` Sampler` interface for running circuits on the hardware service.
149-
* Conisder also providing a noise model that users can use to simulate the
149+
* Consider also providing a noise model that users can use to simulate the
150150
device if direct access is not available.
151151

152152

0 commit comments

Comments
 (0)