Skip to content

Commit c5affe9

Browse files
authored
Merge branch 'quantumlib:main' into main
2 parents 26d1d12 + aa3cc11 commit c5affe9

File tree

10 files changed

+17
-1444
lines changed

10 files changed

+17
-1444
lines changed

cirq-core/cirq/study/resolver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def _resolve_value(val: Any) -> Any:
285285
return val.p
286286
if isinstance(val, sympy_numbers.RationalConstant):
287287
return val.p / val.q
288-
if val == sympy.pi:
288+
if val is sympy.pi:
289289
return np.pi
290290

291291
getter = getattr(val, '_resolved_value_', None)

dev_tools/cirq-infra/README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
# Cirq infra
22

3-
This doc describes cirq-infra, the GCP project supporting our open source
4-
project. The following things are planned to be running on GCP:
3+
_Cirq-infra_ is the name of a the Google Cloud Platform (GCP) project implemented and managed by the
4+
Google Quantum AI team in support of open-source projects like Cirq. It was originally introduced
5+
around the years 2020–2021 to implement several systems:
56

6-
* [X] Cirq bot / PR monitor - see [../pr_monitor](../pr_monitor/README.md)
7-
* [X] Triage party for triaging
8-
* [ ] Performance tests and reports
7+
* Automatic merging of pull requests on GitHub
8+
* Automatic labeling of the sizes of changes in pull requests
9+
* Running [Triage Party](https://github.com/google/triage-party), a tool for collaborative
10+
triaging of GitHub issues and pull requests
911

10-
Access is granted to Cirq maintainers only.
12+
The automerge and automatic labeling capabilities were implemented using a homegrown tool called
13+
`pr_monitor`, whose source code was in the [`dev_tools`](../) subdirectory of the Cirq
14+
repository. In 2025, the automerge system was discontinued in favor of using GitHub's "merge
15+
queues", and the size-labeling facility was reimplemented using a GitHub Actions workflow.
16+
`pr_monitor` was retired in the Cirq 1.5 release.
17+
18+
_Cirq-infra_ is still being used to support Triage Party.
1119

1220
## GCP Configuration
1321

22+
Access is granted to Cirq maintainers only.
23+
1424
### Requirements
1525

1626
The tools below are required to manage our infra:

0 commit comments

Comments
 (0)