Skip to content

Commit

Permalink
Merge #4736 #4740 #4741
Browse files Browse the repository at this point in the history
4736: Add Exception to except r=jenshnielsen a=nulinspiratie

This PR changes an except statement in `InstrumentBase.snapshot_base` from `except:` to `except Exception`.
This allows other errors, e.g. a `KeyboardInterrupt`, to halt the snapshot.
Without this modification, a snapshot can take a long time if there is a communication error.

4740: Update tinycss2 requirement from ~=1.2.0 to ~=1.2.1 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [tinycss2](https://github.com/Kozea/tinycss2) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/Kozea/tinycss2/releases">tinycss2's releases</a>.</em></p>
<blockquote>
<h2>v1.2.1</h2>
<ul>
<li>Fix tests included in the source tarball</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/Kozea/tinycss2/blob/master/docs/changelog.rst">tinycss2's changelog</a>.</em></p>
<blockquote>
<h2>Version 1.2.1</h2>
<p>Released on 2022-10-18.</p>
<ul>
<li>Fix tests included in the source tarball</li>
</ul>
<h2>Version 1.2.0</h2>
<p>Released on 2022-10-17.</p>
<ul>
<li>Drop support of Python 3.6</li>
<li>Fix serialization of nested functions with no parameters</li>
<li>Don’t use pytest plugins by default</li>
</ul>
<h2>Version 1.1.1</h2>
<p>Released on 2021-11-22.</p>
<ul>
<li>Add support of Python 3.10.</li>
<li>Include tests in source package.</li>
</ul>
<h2>Version 1.1.0</h2>
<p>Released on 2020-10-29.</p>
<ul>
<li>Drop support of Python 3.5, add support of Python 3.9.</li>
<li>Fix ResourceWarning in tests.</li>
<li>Use Python standard library’s HSL to RGB converter.</li>
<li>Use GitHub Actions for tests.</li>
<li>New code structure, new packaging, new documentation.</li>
</ul>
<h2>Version 1.0.2</h2>
<p>Released on 2019-03-21.</p>
<ul>
<li>Don't crash when indent tokens have no lowercase equivalent name.</li>
</ul>
<h2>Version 1.0.1</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/Kozea/tinycss2/commit/853bc5a5661a59c7a9795a4e2758d0081808ce06"><code>853bc5a</code></a> Version 1.2.1</li>
<li>See full diff in <a href="https://github.com/Kozea/tinycss2/compare/v1.2.0...v1.2.1">compare view</a></li>
</ul>
</details>
<br />


You can trigger a rebase of this PR by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

4741: Update traitlets requirement from ~=5.4.0 to ~=5.5.0 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [traitlets](https://github.com/ipython/traitlets) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/ipython/traitlets/releases">traitlets's releases</a>.</em></p>
<blockquote>
<h2>5.5.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Update tests and docs to use non-deprecated functions by <a href="https://github.com/jasongrout"><code>`@​jasongrout</code></a>` in <a href="https://github-redirect.dependabot.com/ipython/traitlets/pull/778">ipython/traitlets#778</a></li>
<li>Clean up version handling by <a href="https://github.com/blink1073"><code>`@​blink1073</code></a>` in <a href="https://github-redirect.dependabot.com/ipython/traitlets/pull/780">ipython/traitlets#780</a></li>
<li>Prep for jupyter releaser by <a href="https://github.com/blink1073"><code>`@​blink1073</code></a>` in <a href="https://github-redirect.dependabot.com/ipython/traitlets/pull/783">ipython/traitlets#783</a></li>
<li>Format the changelog by <a href="https://github.com/blink1073"><code>`@​blink1073</code></a>` in <a href="https://github-redirect.dependabot.com/ipython/traitlets/pull/785">ipython/traitlets#785</a></li>
<li>Clean up application typing by <a href="https://github.com/blink1073"><code>`@​blink1073</code></a>` in <a href="https://github-redirect.dependabot.com/ipython/traitlets/pull/786">ipython/traitlets#786</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/ipython/traitlets/compare/5.4.0...5.5.0">https://github.com/ipython/traitlets/compare/5.4.0...5.5.0</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/ipython/traitlets/blob/main/CHANGELOG.md">traitlets's changelog</a>.</em></p>
<blockquote>
<h2>5.5.0</h2>
<ul>
<li>Clean up application typing</li>
<li>Update tests and docs to use non-deprecated functions</li>
<li>Clean up version handling</li>
<li>Prep for jupyter releaser</li>
<li>Format the changelog</li>
</ul>
<!-- raw HTML omitted -->
<h2>5.4.0</h2>
<ul>
<li>Fix version_info</li>
<li>Make generated config files more lintable</li>
<li>Fix union trait from string</li>
<li>Add security.md, and tidelift bage</li>
</ul>
<h2>5.3.0</h2>
<ul>
<li>Fix traitlet name in docstring</li>
<li>Re-support multiple-alias key for ArgParseConfigLoader</li>
</ul>
<h2>5.2.2</h2>
<ul>
<li>Make <code>traitlets.__all__</code> explicit and validate in test.</li>
<li>Fix <code>KeyError</code> in <code>Application.get_default_logging_config</code>.</li>
</ul>
<h2>5.2.1</h2>
<ul>
<li>logging: Don't attempt to close handlers unless they have been
opened. Fixes <code>ValueError: Unable to configure formatter 'console'</code> traceback.</li>
</ul>
<h2>5.2.0</h2>
<p>Traitlets 5.2 brings a couple of updates and changes to traitlets, and
is recommended for all users. What follows is a non-exhaustive list of
changes:</p>
<ul>
<li>Application: add logging_config trait.</li>
<li>Disambiguate the use of the term value in the example.</li>
<li>Add mypy typing support.</li>
<li>DOC: Add log example.</li>
<li>Internal cleanup: linters, autoformatters, CI.</li>
</ul>
<h2>5.1.1</h2>
<p>5.1.1 fixes compatibility issues with Python 3.10 (rc2).</p>
<h2>5.1.0</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/ipython/traitlets/commit/c17eb89e8201e06791e5439585d34d05c28aefff"><code>c17eb89</code></a> Release 5.5.0</li>
<li><a href="https://github.com/ipython/traitlets/commit/4d34eddc3af103f59513cc919217841aa7236ddf"><code>4d34edd</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ipython/traitlets/issues/786">#786</a> from blink1073/cleanup-types</li>
<li><a href="https://github.com/ipython/traitlets/commit/ea40cb6aa6b6ab7349b6f74276ddbbbd01f5a7da"><code>ea40cb6</code></a> clean up application typing</li>
<li><a href="https://github.com/ipython/traitlets/commit/8795302d158814ab45f9380af9edb5e7520d3ab6"><code>8795302</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ipython/traitlets/issues/785">#785</a> from blink1073/fix-changelog-formatting</li>
<li><a href="https://github.com/ipython/traitlets/commit/30e4395140519784b00e381345b10fe2809ce479"><code>30e4395</code></a> format the changelog</li>
<li><a href="https://github.com/ipython/traitlets/commit/c2d6c0b4a59eec7b8d2f0f3fc4b70640bd49732f"><code>c2d6c0b</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ipython/traitlets/issues/783">#783</a> from blink1073/prep-jupyter-releaser</li>
<li><a href="https://github.com/ipython/traitlets/commit/c4094113c7592d8d157fd9beb8e7521e90c21885"><code>c409411</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/ipython/traitlets/issues/784">#784</a> from ipython/pre-commit-ci-update-config</li>
<li><a href="https://github.com/ipython/traitlets/commit/9fd01cc7b279a46e58fddc3c29149e73c7d67ab1"><code>9fd01cc</code></a> [pre-commit.ci] auto fixes from pre-commit.com hooks</li>
<li><a href="https://github.com/ipython/traitlets/commit/6e49343fe4e569410272ecb20139b327dbf130da"><code>6e49343</code></a> Update .pre-commit-config.yaml</li>
<li><a href="https://github.com/ipython/traitlets/commit/8a6b4322c8f1945ed9e956aebe829c138d052b4d"><code>8a6b432</code></a> [pre-commit.ci] pre-commit autoupdate</li>
<li>Additional commits viewable in <a href="https://github.com/ipython/traitlets/compare/5.4.0...5.5.0">compare view</a></li>
</ul>
</details>
<br />


You can trigger a rebase of this PR by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: The Beefy One <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 19, 2022
4 parents 63bd2c8 + 2106278 + 9e8359e + e58103e commit 5073dd7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion qcodes/instrument/instrument_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ def snapshot_base(
update_par = update
try:
snap["parameters"][name] = param.snapshot(update=update_par)
except:
except Exception:
# really log this twice. Once verbose for the UI and once
# at lower level with more info for file based loggers
self.log.warning("Snapshot: Could not update parameter: %s", name)
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ stack-data~=0.5.1
stringparser~=0.5
tabulate~=0.9.0
terminado~=0.16.0
tinycss2~=1.2.0
tinycss2~=1.2.1
tomli~=2.0.1
tornado~=6.2
towncrier~=22.8.0
tqdm~=4.64.1
traitlets~=5.4.0
traitlets~=5.5.0
types-requests~=2.28.11
types-setuptools~=65.5.0
types-tabulate~=0.9.0
Expand Down

0 comments on commit 5073dd7

Please sign in to comment.