Skip to content

Commit beaf43b

Browse files
authored
Merge branch 'master' into mh-add-small-icon
2 parents a7604f5 + 10db339 commit beaf43b

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
201201

202202
- name: Set up Python with caching of pip dependencies
203-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
203+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
204204
with:
205205
python-version: ${{inputs.python_ver || env.python_ver}}
206206
architecture: 'x64'
@@ -231,7 +231,7 @@ jobs:
231231
fetch-depth: 0
232232

233233
- name: Set up Python and restore cache
234-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
234+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
235235
with:
236236
python-version: ${{inputs.python_ver || env.python_ver}}
237237
architecture: 'x64'
@@ -258,7 +258,7 @@ jobs:
258258
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
259259

260260
- name: Set up Python and restore cache
261-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
261+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
262262
with:
263263
python-version: ${{inputs.python_ver || env.python_ver}}
264264
architecture: 'x64'
@@ -285,7 +285,7 @@ jobs:
285285
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
286286

287287
- name: Set up Python and restore cache
288-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
288+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
289289
with:
290290
python-version: ${{inputs.python_ver || env.python_ver}}
291291
architecture: 'x64'
@@ -325,7 +325,7 @@ jobs:
325325
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
326326

327327
- name: Set up Python and restore cache
328-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
328+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
329329
with:
330330
python-version: ${{inputs.python_ver || env.python_ver}}
331331
cache: pip
@@ -372,7 +372,7 @@ jobs:
372372
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
373373

374374
- name: Set up Python and restore cache
375-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
375+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
376376
with:
377377
python-version: ${{inputs.python_ver || env.python_ver}}
378378
cache: pip
@@ -416,7 +416,7 @@ jobs:
416416
# Note: deliberately not using our Python cache here b/c this runs
417417
# a different version of Python.
418418
- name: Set up Python and restore cache
419-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
419+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
420420
with:
421421
python-version: ${{env.python_compat_ver}}
422422

@@ -442,7 +442,7 @@ jobs:
442442
fetch-depth: 0
443443

444444
- name: Set up Python and restore cache
445-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
445+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
446446
with:
447447
python-version: ${{inputs.python_ver || env.python_ver}}
448448
cache: pip
@@ -556,7 +556,7 @@ jobs:
556556

557557
# The next action simply fails if there are any unpinned actions.
558558
- name: Verify that all workflow actions have pinned versions
559-
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@25ed13d0628a1601b4b44048e63cc4328ed03633
559+
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@4830be28ce81da52ec70d65c552a7403821d98d4
560560

561561
# If we didn't fail the previous check, go on to more time-consuming ones.
562562
- name: Install actionlint

.github/workflows/nightly-pytest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
8181

8282
- name: Set up Python ${{matrix.python-version}}
83-
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
83+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
8484
id: cache
8585
with:
8686
python-version: ${{matrix.python-version}}

dev_tools/conf/pytest.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[pytest]
22
markers =
33
slow: marks tests as slow (deselect with '-m "not slow"')
4+
5+
# Silence deprecation warnings about option "asyncio_default_fixture_loop_scope"
6+
asyncio_default_fixture_loop_scope = "function"

0 commit comments

Comments
 (0)