Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies = [
"packaging>=20.0",
"pandas>=1.5.0",
"pyarrow>=11.0.0", # will become a requirement of pandas. Installing explicitly silences a warning
"pyvisa>=1.11.0, <1.16.0",
"pyvisa>=1.11.0, <1.17.0",
"ruamel.yaml>=0.16.0,!=0.16.6",
"tabulate>=0.9.0",
"typing_extensions>=4.6.0",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ python-dateutil==2.9.0.post0
# pandas
pytz==2025.2
# via pandas
pyvisa==1.15.0
pyvisa==1.16.0
# via
# qcodes (pyproject.toml)
# pyvisa-sim
Expand Down
9 changes: 6 additions & 3 deletions tests/test_visa.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,12 @@ def use_magnet() -> pyvisa.ResourceManager:
# and the instrument should no longer be in the instrument registry
assert len(Instrument._all_instruments) == 0
assert len(rm.list_opened_resources()) == 0
assert (
caplog.records[-1].message == "Closing VISA handle to x as there are no non "
"weak references to the instrument."
# the order of the log messages depends on the pyvisa version but regardless
# of which version we should see the message about closing the handle
assert any(
record.message
== "Closing VISA handle to x as there are no non weak references to the instrument."
for record in caplog.records
)


Expand Down
Loading