Skip to content

Commit a8e84f8

Browse files
Merge branch 'main' into issue-435-numbers-real
2 parents 74ba10d + 7f29559 commit a8e84f8

13 files changed

Lines changed: 2415 additions & 156 deletions

.github/actionlint.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Copyright 2025 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# https://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Summary: configure actionlint (https://github.com/rhysd/actionlint) to
16+
# recognize action runner names/labels that we use.
17+
18+
self-hosted-runner:
19+
labels:
20+
# Defined in Quantumlib org.
21+
- ubuntu-22.04-arm64-2-core
22+
- ubuntu-22.04-arm64-8-core
23+
- ubuntu-22.04-arm64-16-core
24+
25+
- ubuntu-22.04-x64-2-core
26+
- ubuntu-22.04-x64-8-core
27+
- ubuntu-22.04-x64-16-core
28+
29+
- ubuntu-24.04-arm64-2-core
30+
- ubuntu-24.04-arm64-8-core
31+
- ubuntu-24.04-arm64-16-core
32+
33+
- ubuntu-24.04-x64-2-core
34+
- ubuntu-24.04-x64-8-core
35+
- ubuntu-24.04-x64-16-core
36+
37+
- windows-2022-x64-8-core
38+
- windows-2025-x64-8-core
39+
- windows-2025-x64-16-core
40+
41+
# From https://github.com/actions/partner-runner-images
42+
- ubuntu-24.04-arm
43+
44+
# New from GitHub (late 2025) but currently not known by actionlint.
45+
# https://docs.github.com/en/actions/reference/runners/github-hosted-runners
46+
- ubuntu-slim

.github/workflows/ci.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ env:
5858
jobs:
5959
pytest:
6060
name: Run Python tests
61-
runs-on: ubuntu-24.04
61+
runs-on: ubuntu-22.04-x64-8-core
6262
timeout-minutes: 15
6363
strategy:
6464
matrix:
@@ -92,7 +92,7 @@ jobs:
9292
# OMP_NUM_THREADS: PySCF's poor OpenMP performance slows down QCQMC tests.
9393
# RECIRQ_IMPORT_FAILSAFE: skip tests on unsupported Cirq configurations.
9494
export OMP_NUM_THREADS=1
95-
RECIRQ_IMPORT_FAILSAFE=y pytest -v --skipslow
95+
RECIRQ_IMPORT_FAILSAFE=y pytest -n logical -v --skipslow
9696
9797
pylint:
9898
name: Run Python linters
@@ -144,3 +144,21 @@ jobs:
144144
- name: Check notebook formatting
145145
run: |
146146
dev_tools/nbformat
147+
148+
yaml-lint:
149+
name: YAML lint checks
150+
runs-on: ubuntu-slim
151+
timeout-minutes: 15
152+
steps:
153+
- name: Check out a copy of the git repository
154+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
155+
with:
156+
fetch-depth: 0
157+
158+
- name: Install yamllint
159+
run: |
160+
sudo apt-get update
161+
sudo apt-get install --no-install-recommends -y yamllint
162+
163+
- name: Lint the YAML files
164+
run: yamllint -f github .

.github/workflows/osv-scanner.yaml

Lines changed: 0 additions & 152 deletions
This file was deleted.

dev_tools/write-ci-requirements.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'current': '~=1.4.0',
1313
'next': '>=1.5.0',
1414
}
15-
"""Give names to relative Cirq versions so CI can have consistent names while versions
15+
"""Give names to relative Cirq versions so CI can have consistent names while versions
1616
get incremented."""
1717

1818

@@ -76,7 +76,7 @@ def main(*, out_fn: str = 'ci-requirements.txt', relative_cirq_version: str = 'c
7676

7777
extras_require = [
7878
'otoc', 'qaoa', 'optimize', 'hfvqe', 'fermi_hubbard', 'qml_lfe',
79-
'seniority_zero', 'qcqmc'
79+
'seniority_zero', 'qcqmc', 'contextuality'
8080
]
8181
extras_require = {
8282
r: _parse_requirements(pathlib.Path(REPO_DIR / f'recirq/{r}/extra-requirements.txt'))

recirq/contextuality/__init__.py

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
stim
2+
stimcirq

0 commit comments

Comments
 (0)