Skip to content

Commit a91e175

Browse files
NoureldinYosriNoureldinYosri
authored
Merge branch 'main' into 2q_xeb
2 parents e6151f0 + 36e91b0 commit a91e175

File tree

5 files changed

+67
-63
lines changed

5 files changed

+67
-63
lines changed

‎.github/workflows/ci-daily.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
python-version: ['3.9', '3.10', '3.11']
1818
runs-on: ubuntu-20.04
1919
steps:
20-
- uses: actions/checkout@v3
21-
- uses: actions/setup-python@v4
20+
- uses: actions/checkout@v4
21+
- uses: actions/setup-python@v5
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
architecture: 'x64'
25-
- uses: actions/cache@v2
25+
- uses: actions/cache@v4
2626
with:
2727
path: ${{ env.pythonLocation }}
2828
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
@@ -32,7 +32,8 @@ jobs:
3232
pip install \
3333
-r dev_tools/requirements/deps/format.txt \
3434
-r dev_tools/requirements/deps/pylint.txt \
35-
-r dev_tools/requirements/deps/pytest.txt
35+
-r dev_tools/requirements/deps/pytest.txt \
36+
-r dev_tools/requirements/deps/notebook.txt
3637
- name: Run Quil dependencies
3738
run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
3839
- name: Pytest check
@@ -46,12 +47,12 @@ jobs:
4647
python-version: ['3.9', '3.10', '3.11']
4748
runs-on: windows-2019
4849
steps:
49-
- uses: actions/checkout@v3
50-
- uses: actions/setup-python@v4
50+
- uses: actions/checkout@v4
51+
- uses: actions/setup-python@v5
5152
with:
5253
python-version: ${{ matrix.python-version }}
5354
architecture: 'x64'
54-
- uses: actions/cache@v2
55+
- uses: actions/cache@v4
5556
with:
5657
path: ${{ env.pythonLocation }}
5758
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
@@ -60,7 +61,8 @@ jobs:
6061
pip install --pre cirq &&
6162
pip install -r dev_tools/requirements/deps/format.txt &&
6263
pip install -r dev_tools/requirements/deps/pylint.txt &&
63-
pip install -r dev_tools/requirements/deps/pytest.txt
64+
pip install -r dev_tools/requirements/deps/pytest.txt &&
65+
pip install -r dev_tools/requirements/deps/notebook.txt
6466
- name: Pytest Windows
6567
run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests
6668
shell: bash
@@ -71,12 +73,12 @@ jobs:
7173
python-version: ['3.9', '3.10', '3.11']
7274
runs-on: macos-latest
7375
steps:
74-
- uses: actions/checkout@v3
75-
- uses: actions/setup-python@v4
76+
- uses: actions/checkout@v4
77+
- uses: actions/setup-python@v5
7678
with:
7779
python-version: ${{ matrix.python-version }}
7880
architecture: 'x64'
79-
- uses: actions/cache@v2
81+
- uses: actions/cache@v4
8082
with:
8183
path: ${{ env.pythonLocation }}
8284
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}

‎.github/workflows/ci-weekly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
partition: [partition-0, partition-1, partition-2, partition-3]
2121
runs-on: ubuntu-20.04
2222
steps:
23-
- uses: actions/checkout@v3
24-
- uses: actions/setup-python@v4
23+
- uses: actions/checkout@v4
24+
- uses: actions/setup-python@v5
2525
with:
2626
python-version: '3.9'
2727
architecture: 'x64'

‎.github/workflows/ci.yml‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
name: Misc check
1818
runs-on: ubuntu-20.04
1919
steps:
20-
- uses: actions/checkout@v3
21-
- uses: actions/setup-python@v4
20+
- uses: actions/checkout@v4
21+
- uses: actions/setup-python@v5
2222
with:
2323
python-version: '3.9'
2424
architecture: 'x64'
@@ -28,8 +28,8 @@ jobs:
2828
name: Packaging test
2929
runs-on: ubuntu-20.04
3030
steps:
31-
- uses: actions/checkout@v3
32-
- uses: actions/setup-python@v4
31+
- uses: actions/checkout@v4
32+
- uses: actions/setup-python@v5
3333
with:
3434
python-version: '3.9'
3535
architecture: 'x64'
@@ -41,10 +41,10 @@ jobs:
4141
name: Format check
4242
runs-on: ubuntu-20.04
4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
with:
4646
fetch-depth: 0
47-
- uses: actions/setup-python@v4
47+
- uses: actions/setup-python@v5
4848
with:
4949
python-version: '3.9'
5050
architecture: 'x64'
@@ -56,8 +56,8 @@ jobs:
5656
name: Type check
5757
runs-on: ubuntu-20.04
5858
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-python@v4
59+
- uses: actions/checkout@v4
60+
- uses: actions/setup-python@v5
6161
with:
6262
python-version: '3.9'
6363
architecture: 'x64'
@@ -69,10 +69,10 @@ jobs:
6969
name: Changed files test
7070
runs-on: ubuntu-20.04
7171
steps:
72-
- uses: actions/checkout@v3
72+
- uses: actions/checkout@v4
7373
with:
7474
fetch-depth: 0
75-
- uses: actions/setup-python@v4
75+
- uses: actions/setup-python@v5
7676
with:
7777
python-version: '3.9'
7878
architecture: 'x64'
@@ -84,8 +84,8 @@ jobs:
8484
name: Lint check
8585
runs-on: ubuntu-20.04
8686
steps:
87-
- uses: actions/checkout@v3
88-
- uses: actions/setup-python@v4
87+
- uses: actions/checkout@v4
88+
- uses: actions/setup-python@v5
8989
with:
9090
python-version: '3.9'
9191
architecture: 'x64'
@@ -99,8 +99,8 @@ jobs:
9999
name: Doc test
100100
runs-on: ubuntu-20.04
101101
steps:
102-
- uses: actions/checkout@v3
103-
- uses: actions/setup-python@v4
102+
- uses: actions/checkout@v4
103+
- uses: actions/setup-python@v5
104104
with:
105105
python-version: '3.9'
106106
architecture: 'x64'
@@ -114,8 +114,8 @@ jobs:
114114
name: Notebook formatting
115115
runs-on: ubuntu-20.04
116116
steps:
117-
- uses: actions/checkout@v3
118-
- uses: actions/setup-python@v4
117+
- uses: actions/checkout@v4
118+
- uses: actions/setup-python@v5
119119
with:
120120
python-version: '3.9'
121121
architecture: 'x64'
@@ -127,7 +127,7 @@ jobs:
127127
name: Shell check
128128
runs-on: ubuntu-20.04
129129
steps:
130-
- uses: actions/checkout@v3
130+
- uses: actions/checkout@v4
131131
with:
132132
fetch-depth: 0
133133
- name: Run shellcheck
@@ -136,8 +136,8 @@ jobs:
136136
name: Isolated pytest Ubuntu
137137
runs-on: ubuntu-20.04
138138
steps:
139-
- uses: actions/checkout@v3
140-
- uses: actions/setup-python@v4
139+
- uses: actions/checkout@v4
140+
- uses: actions/setup-python@v5
141141
with:
142142
python-version: '3.9'
143143
architecture: 'x64'
@@ -152,12 +152,12 @@ jobs:
152152
python-version: [ '3.9', '3.10', '3.11' ]
153153
runs-on: ubuntu-20.04
154154
steps:
155-
- uses: actions/checkout@v3
156-
- uses: actions/setup-python@v4
155+
- uses: actions/checkout@v4
156+
- uses: actions/setup-python@v5
157157
with:
158158
python-version: ${{ matrix.python-version }}
159159
architecture: 'x64'
160-
- uses: actions/cache@v2
160+
- uses: actions/cache@v4
161161
with:
162162
path: ${{ env.pythonLocation }}
163163
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
@@ -175,8 +175,8 @@ jobs:
175175
name: Check consistency of requirements
176176
runs-on: ubuntu-20.04
177177
steps:
178-
- uses: actions/checkout@v3
179-
- uses: actions/setup-python@v4
178+
- uses: actions/checkout@v4
179+
- uses: actions/setup-python@v5
180180
with:
181181
python-version: '3.9'
182182
architecture: 'x64'
@@ -189,10 +189,10 @@ jobs:
189189
name: Build protos
190190
runs-on: ubuntu-20.04
191191
steps:
192-
- uses: actions/checkout@v3
192+
- uses: actions/checkout@v4
193193
with:
194194
fetch-depth: 0
195-
- uses: actions/setup-python@v4
195+
- uses: actions/setup-python@v5
196196
with:
197197
python-version: '3.9'
198198
architecture: 'x64'
@@ -205,14 +205,14 @@ jobs:
205205
name: Coverage check
206206
runs-on: ubuntu-20.04
207207
steps:
208-
- uses: actions/checkout@v3
208+
- uses: actions/checkout@v4
209209
with:
210210
fetch-depth: 0
211-
- uses: actions/setup-python@v4
211+
- uses: actions/setup-python@v5
212212
with:
213213
python-version: '3.9'
214214
architecture: 'x64'
215-
- uses: actions/cache@v2
215+
- uses: actions/cache@v4
216216
with:
217217
path: ${{ env.pythonLocation }}
218218
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
@@ -235,12 +235,12 @@ jobs:
235235
python-version: [ '3.9', '3.10', '3.11' ]
236236
runs-on: windows-2019
237237
steps:
238-
- uses: actions/checkout@v3
239-
- uses: actions/setup-python@v4
238+
- uses: actions/checkout@v4
239+
- uses: actions/setup-python@v5
240240
with:
241241
python-version: ${{ matrix.python-version }}
242242
architecture: 'x64'
243-
- uses: actions/cache@v2
243+
- uses: actions/cache@v4
244244
with:
245245
path: ${{ env.pythonLocation }}
246246
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
@@ -260,12 +260,12 @@ jobs:
260260
python-version: [ '3.9', '3.10', '3.11' ]
261261
runs-on: macos-latest
262262
steps:
263-
- uses: actions/checkout@v3
264-
- uses: actions/setup-python@v4
263+
- uses: actions/checkout@v4
264+
- uses: actions/setup-python@v5
265265
with:
266266
python-version: ${{ matrix.python-version }}
267267
architecture: 'x64'
268-
- uses: actions/cache@v2
268+
- uses: actions/cache@v4
269269
with:
270270
path: ${{ env.pythonLocation }}
271271
key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
@@ -285,10 +285,10 @@ jobs:
285285
partition: [partition-0, partition-1, partition-2, partition-3]
286286
runs-on: ubuntu-20.04
287287
steps:
288-
- uses: actions/checkout@v3
288+
- uses: actions/checkout@v4
289289
with:
290290
fetch-depth: 0
291-
- uses: actions/setup-python@v4
291+
- uses: actions/setup-python@v5
292292
with:
293293
python-version: '3.9'
294294
architecture: 'x64'
@@ -305,8 +305,8 @@ jobs:
305305
name: Notebook Tests against PR
306306
runs-on: ubuntu-20.04
307307
steps:
308-
- uses: actions/checkout@v3
309-
- uses: actions/setup-python@v4
308+
- uses: actions/checkout@v4
309+
- uses: actions/setup-python@v5
310310
with:
311311
python-version: '3.9'
312312
architecture: 'x64'
@@ -323,8 +323,8 @@ jobs:
323323
name: Bundle file consistency
324324
runs-on: ubuntu-20.04
325325
steps:
326-
- uses: actions/checkout@v3
327-
- uses: actions/setup-node@v2
326+
- uses: actions/checkout@v4
327+
- uses: actions/setup-node@v4
328328
with:
329329
node-version: '14.16.1'
330330
- name: Install npm
@@ -335,8 +335,8 @@ jobs:
335335
name: Typescript lint check
336336
runs-on: ubuntu-20.04
337337
steps:
338-
- uses: actions/checkout@v3
339-
- uses: actions/setup-node@v2
338+
- uses: actions/checkout@v4
339+
- uses: actions/setup-node@v4
340340
with:
341341
node-version: '14.16.1'
342342
- name: Install npm
@@ -347,8 +347,8 @@ jobs:
347347
name: Typescript tests
348348
runs-on: ubuntu-20.04
349349
steps:
350-
- uses: actions/checkout@v3
351-
- uses: actions/setup-node@v2
350+
- uses: actions/checkout@v4
351+
- uses: actions/setup-node@v4
352352
with:
353353
node-version: '14.16.1'
354354
- name: Install npm dependencies
@@ -361,8 +361,8 @@ jobs:
361361
name: Typescript tests coverage
362362
runs-on: ubuntu-20.04
363363
steps:
364-
- uses: actions/checkout@v3
365-
- uses: actions/setup-node@v2
364+
- uses: actions/checkout@v4
365+
- uses: actions/setup-node@v4
366366
with:
367367
node-version: '14.16.1'
368368
- name: Install npm dependencies

‎.github/workflows/release-main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
env:
1313
NAME: dev-release
1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-python@v4
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.9'
1919
architecture: 'x64'

‎dev_tools/requirements/deps/notebook.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ ipykernel==5.3.4
88

99
# for executing notebooks in tests
1010
papermill~=2.3.2
11-
quimb~=1.6.0
11+
12+
# for notebooks that do `pip install cirq-core[contrib]`
13+
-r ../../../cirq-core/cirq/contrib/requirements.txt
1214

1315
# assumed to be part of colab
1416
seaborn~=0.11.1

0 commit comments

Comments
 (0)