Skip to content

Commit 2b6bec9

Browse files
authored
Merge branch 'microsoft:main' into feature/add-cryomagnetics-tm620-driver
2 parents aec59fe + 2d906a8 commit 2b6bec9

File tree

12 files changed

+55
-43
lines changed

12 files changed

+55
-43
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ jobs:
3535
egress-policy: audit
3636

3737
- name: Checkout repository
38-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
38+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3939

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
42+
uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
4343
with:
4444
languages: ${{ matrix.language }}
4545

4646
- name: Autobuild
47-
uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
47+
uses: github/codeql-action/autobuild@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
4848

4949
- name: Perform CodeQL Analysis
50-
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
50+
uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
egress-policy: audit
3838

39-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
submodules: true
4242
# we need full history with tags for the version number

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
egress-policy: audit
2323

2424
- name: 'Checkout Repository'
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626
- name: 'Dependency Review'
2727
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1

.github/workflows/docs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
4545
with:
4646
egress-policy: audit
47-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
47+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4848
with:
4949
# we need full history with tags for the version number
5050
fetch-depth: '0'
@@ -115,10 +115,10 @@ jobs:
115115
with:
116116
egress-policy: audit
117117

118-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
118+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
119119

120120
- name: Download artifact
121-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
121+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
122122
with:
123123
name: docs_3.11_ubuntu-latest
124124
path: build_docs

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
with:
2323
egress-policy: audit
2424

25-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2727
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

.github/workflows/pytest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
egress-policy: audit
5656

57-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5858
with:
5959
submodules: true
6060
# we need full history with tags for the version number

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
egress-policy: audit
3737

3838
- name: "Checkout code"
39-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
persist-credentials: false
4242

@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
74+
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
7575
with:
7676
sarif_file: results.sarif

.github/workflows/upload_to_pypi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
egress-policy: audit
2323

24-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
- name: Set up Python
2626
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2727
with:

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ dependencies = [
3737
"pyvisa>=1.11.0, <1.16.0",
3838
"ruamel.yaml>=0.16.0,!=0.16.6",
3939
"tabulate>=0.9.0",
40-
"types-networkx >= 3.1", # Version should match the networkx requirment
4140
"typing_extensions>=4.6.0",
4241
"tqdm>=4.59.0",
4342
"uncertainties>=3.2.0",
@@ -63,7 +62,7 @@ Changelog = "https://microsoft.github.io/Qcodes/changes/index.html"
6362
zurichinstruments = ["zhinst-qcodes>=0.3"]
6463
loop = ["qcodes_loop>=0.1.2"]
6564
test = [
66-
"coverage[toml]>=6.3.0",
65+
"coverage[toml]>=7.6.9",
6766
"deepdiff>=5.0.2",
6867
"hypothesis>=6.130.0",
6968
"lxml>=4.9.4",
@@ -79,6 +78,7 @@ test = [
7978
"PyVisa-sim>=0.6.0",
8079
"sphinx>=4.5.0", # sphinx extension tests
8180
"types-jsonschema>=4.16.0",
81+
"types-networkx >= 3.1", # Version should match the networkx requirment
8282
"types_requests>=0.1.8",
8383
"types-tabulate>=0.1.0",
8484
"types-tqdm>=4.64.6",

requirements.txt

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# uv pip compile pyproject.toml --extra test --extra docs --output-file .\requirements.txt
33
# manually removed qcodes it self from the requirements and added version and platform specific env markers
44
# for pywin32
5+
accessible-pygments==0.0.5
6+
# via furo
57
alabaster==1.0.0
68
# via sphinx
79
asttokens==3.0.0
@@ -27,11 +29,11 @@ broadbean==0.14.0
2729
# qcodes
2830
certifi==2025.8.3
2931
# via requests
30-
cf-xarray==0.10.6
32+
cf-xarray==0.10.7
3133
# via
3234
# qcodes (pyproject.toml)
3335
# qcodes
34-
charset-normalizer==3.4.2
36+
charset-normalizer==3.4.3
3537
# via requests
3638
click==8.2.1
3739
# via
@@ -52,7 +54,7 @@ comm==0.2.3
5254
# ipywidgets
5355
contourpy==1.3.3
5456
# via matplotlib
55-
coverage==7.10.2
57+
coverage==7.10.3
5658
# via
5759
# qcodes (pyproject.toml)
5860
# pytest-cov
@@ -62,11 +64,11 @@ dask==2025.7.0
6264
# via
6365
# qcodes (pyproject.toml)
6466
# qcodes
65-
debugpy==1.8.15
67+
debugpy==1.8.16
6668
# via ipykernel
6769
decorator==5.2.1
6870
# via ipython
69-
deepdiff==8.5.0
71+
deepdiff==8.6.0
7072
# via qcodes (pyproject.toml)
7173
defusedxml==0.7.1
7274
# via nbconvert
@@ -79,15 +81,15 @@ execnet==2.1.1
7981
# via pytest-xdist
8082
executing==2.2.0
8183
# via stack-data
82-
fastjsonschema==2.21.1
84+
fastjsonschema==2.21.2
8385
# via nbformat
84-
fonttools==4.59.0
86+
fonttools==4.59.1
8587
# via matplotlib
8688
fsspec==2025.7.0
8789
# via dask
8890
furo==2025.7.19
8991
# via qcodes (pyproject.toml)
90-
h5netcdf==1.6.3
92+
h5netcdf==1.6.4
9193
# via
9294
# qcodes (pyproject.toml)
9395
# qcodes
@@ -100,7 +102,7 @@ h5py==3.14.0
100102
# qcodes-loop
101103
hickle==5.0.3
102104
# via qcodes-loop
103-
hypothesis==6.137.0
105+
hypothesis==6.138.0
104106
# via qcodes (pyproject.toml)
105107
idna==3.10
106108
# via requests
@@ -116,7 +118,6 @@ ipykernel==6.30.1
116118
# qcodes
117119
ipython==9.4.0
118120
# via
119-
# qcodes (pyproject.toml)
120121
# ipykernel
121122
# ipywidgets
122123
# qcodes
@@ -131,7 +132,6 @@ jedi==0.19.2
131132
# via ipython
132133
jinja2==3.1.6
133134
# via
134-
# qcodes (pyproject.toml)
135135
# nbconvert
136136
# nbsphinx
137137
# sphinx
@@ -163,7 +163,7 @@ jupyterlab-pygments==0.3.0
163163
# via nbconvert
164164
jupyterlab-widgets==3.0.15
165165
# via ipywidgets
166-
kiwisolver==1.4.8
166+
kiwisolver==1.4.9
167167
# via matplotlib
168168
lazy-loader==0.4
169169
# via qcodes-loop
@@ -208,6 +208,8 @@ nbsphinx==0.9.6
208208
# via qcodes (pyproject.toml)
209209
nest-asyncio==1.6.0
210210
# via ipykernel
211+
networkx==3.5
212+
# via qcodes (pyproject.toml)
211213
numpy==2.3.2
212214
# via
213215
# qcodes (pyproject.toml)
@@ -221,6 +223,7 @@ numpy==2.3.2
221223
# qcodes
222224
# qcodes-loop
223225
# scipy
226+
# types-networkx
224227
# xarray
225228
# zhinst-core
226229
# zhinst-qcodes
@@ -289,6 +292,7 @@ pyelftools==0.32
289292
# via zhinst-toolkit
290293
pygments==2.19.2
291294
# via
295+
# accessible-pygments
292296
# furo
293297
# ipython
294298
# ipython-pygments-lexers
@@ -356,7 +360,7 @@ requests==2.32.4
356360
# sphinx-jsonschema
357361
roman-numerals-py==3.1.0
358362
# via sphinx
359-
rpds-py==0.26.0
363+
rpds-py==0.27.0
360364
# via
361365
# jsonschema
362366
# referencing
@@ -424,9 +428,8 @@ toolz==1.0.0
424428
# via
425429
# dask
426430
# partd
427-
tornado==6.5.1
431+
tornado==6.5.2
428432
# via
429-
# qcodes (pyproject.toml)
430433
# ipykernel
431434
# jupyter-client
432435
# qcodes
@@ -440,7 +443,6 @@ tqdm==4.67.1
440443
# qcodes
441444
traitlets==5.14.3
442445
# via
443-
# comm
444446
# ipykernel
445447
# ipython
446448
# ipywidgets
@@ -451,19 +453,21 @@ traitlets==5.14.3
451453
# nbconvert
452454
# nbformat
453455
# nbsphinx
454-
types-jsonschema==4.25.0.20250720
456+
types-jsonschema==4.25.0.20250809
457+
# via qcodes (pyproject.toml)
458+
types-networkx==3.5.0.20250812
455459
# via qcodes (pyproject.toml)
456-
types-pytz==2025.2.0.20250516
460+
types-pytz==2025.2.0.20250809
457461
# via pandas-stubs
458-
types-pywin32==311.0.0.20250801
462+
types-pywin32==311.0.0.20250809
459463
# via qcodes (pyproject.toml)
460-
types-requests==2.32.4.20250611
464+
types-requests==2.32.4.20250809
461465
# via
462466
# qcodes (pyproject.toml)
463467
# types-tqdm
464468
types-tabulate==0.9.0.20241207
465469
# via qcodes (pyproject.toml)
466-
types-tqdm==4.67.0.20250516
470+
types-tqdm==4.67.0.20250809
467471
# via qcodes (pyproject.toml)
468472
typing-extensions==4.14.1
469473
# via
@@ -506,9 +510,9 @@ websockets==15.0.1
506510
# qcodes
507511
widgetsnbextension==4.0.14
508512
# via ipywidgets
509-
wrapt==1.17.2
513+
wrapt==1.17.3
510514
# via qcodes
511-
xarray==2025.7.1
515+
xarray==2025.8.0
512516
# via
513517
# qcodes (pyproject.toml)
514518
# cf-xarray

0 commit comments

Comments
 (0)