Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move VoltageDivider into parameters and deprecate #4923

Merged
merged 6 commits into from Jan 13, 2023

Conversation

jenshnielsen
Copy link
Collaborator

@jenshnielsen jenshnielsen commented Jan 12, 2023

This is not an instrument but a Parameter so it makes more sense for it to live there.
Since DelegateParamerer does the same more general and better deprecate this one

@codecov
Copy link

codecov bot commented Jan 12, 2023

Codecov Report

Merging #4923 (262793f) into master (262793f) will not change coverage.
The diff coverage is n/a.

❗ Current head 262793f differs from pull request most recent head be2889a. Consider uploading reports for the commit be2889a to get more accurate results

@@           Coverage Diff           @@
##           master    #4923   +/-   ##
=======================================
  Coverage   68.39%   68.39%           
=======================================
  Files         352      352           
  Lines       32349    32349           
=======================================
  Hits        22126    22126           
  Misses      10223    10223           

Copy link
Contributor

@astafan8 astafan8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or rather deprecate it. DelegateParameter does much the same thing with scale

agree to the deprecation approach

@jenshnielsen jenshnielsen changed the title Move VoltageDivider into parameters. Move VoltageDivider into parameters and deprecate Jan 12, 2023
@jenshnielsen
Copy link
Collaborator Author

bors merge

bors bot added a commit that referenced this pull request Jan 13, 2023
4923: Move VoltageDivider into parameters and deprecate r=jenshnielsen a=jenshnielsen

This is not an instrument but a Parameter so it makes more sense for it to live there. 
Since DelegateParamerer does the same more general and better deprecate this one

4927: Update pyzmq requirement from ~=24.0.1 to ~=25.0.0 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [pyzmq](https://github.com/zeromq/pyzmq) to permit the latest version.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/zeromq/pyzmq/commit/8e4e5c80dc16ecaed06d9c95e4947bae478a6177"><code>8e4e5c8</code></a> Bump to 25.0.0</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/e4d380d0ff6de36674084d5899dcfa29dcfd656a"><code>e4d380d</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/zeromq/pyzmq/issues/1819">#1819</a> from minrk/cl-25</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/cab205f49f71eaa5ff9783f5907ca4685e90dd57"><code>cab205f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/zeromq/pyzmq/issues/1824">#1824</a> from zeromq/pre-commit-ci-update-config</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/f2757ebcc23b91e32b2dfa5a6d0b3ebca7914d9f"><code>f2757eb</code></a> [pre-commit.ci] pre-commit autoupdate</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/917bb884a3ce68fb7ccff95edb02c0f8e0025bcd"><code>917bb88</code></a> note manylinux_2_28 wheels in changelog</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/5666a79661b4f0087e9c9bac9b9331317b86381f"><code>5666a79</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/zeromq/pyzmq/issues/1822">#1822</a> from minrk/cp311-2014</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/a64ec0624c367e3b0d34256032d3dad4fd3f7024"><code>a64ec06</code></a> publish both 2014 and 2_28 wheels for cpython &gt;= 3.10, pypy &gt;= 3.9</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/f5e17f8a250287433265f830646376aa7517a5e6"><code>f5e17f8</code></a> update changelog for 25</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/25545d43ba8be95d27f1215c11a03ff811c92072"><code>25545d4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/zeromq/pyzmq/issues/1818">#1818</a> from minrk/deprecate-test</li>
<li><a href="https://github.com/zeromq/pyzmq/commit/22d0cfd049cb4c93ca41ef0089f65a68c5cfb0bd"><code>22d0cfd</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/zeromq/pyzmq/issues/1817">#1817</a> from minrk/toml-syntax</li>
<li>Additional commits viewable in <a href="https://github.com/zeromq/pyzmq/compare/v24.0.1...v25.0.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: Jens H. Nielsen <Jens.Nielsen@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@bors
Copy link
Contributor

bors bot commented Jan 13, 2023

Build failed (retrying...):

  • pytestmypy (ubuntu-latest, 3.10)
  • pytestnonlocal (3.8)

bors bot added a commit that referenced this pull request Jan 13, 2023
4923: Move VoltageDivider into parameters and deprecate r=jenshnielsen a=jenshnielsen

This is not an instrument but a Parameter so it makes more sense for it to live there. 
Since DelegateParamerer does the same more general and better deprecate this one

Co-authored-by: Jens H. Nielsen <Jens.Nielsen@microsoft.com>
@bors
Copy link
Contributor

bors bot commented Jan 13, 2023

Build failed:

  • pytestnonlocal (3.8)

@jenshnielsen
Copy link
Collaborator Author

bors retry

bors bot added a commit that referenced this pull request Jan 13, 2023
4923: Move VoltageDivider into parameters and deprecate r=jenshnielsen a=jenshnielsen

This is not an instrument but a Parameter so it makes more sense for it to live there. 
Since DelegateParamerer does the same more general and better deprecate this one

4926: Bump pytest-rerunfailures from 10.3 to 11.0 r=jenshnielsen a=dependabot[bot]

Bumps [pytest-rerunfailures](https://github.com/pytest-dev/pytest-rerunfailures) from 10.3 to 11.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-rerunfailures/blob/master/CHANGES.rst">pytest-rerunfailures's changelog</a>.</em></p>
<blockquote>
<h2>11.0 (unreleased)</h2>
<p>Breaking changes
++++++++++++++++</p>
<ul>
<li>
<p>Drop support for Python 3.6.</p>
</li>
<li>
<p>Drop support for pytest &lt; 6.</p>
</li>
</ul>
<p>Bug fixes
+++++++++</p>
<ul>
<li>
<p>Fix crash when pytest-xdist is installed but disabled.
(Thanks to <code>`@mgorny` &lt;https://github.com/mgorny&gt;</code>_ for the PR.)</p>
</li>
<li>
<p>Fix crash when xfail(strict=True) mark is used with --rerun-only flag.</p>
</li>
</ul>
<p>Features
++++++++</p>
<ul>
<li>
<p>Added option <code>--rerun-except</code> to rerun failed tests those are other than the mentioned Error.</p>
</li>
<li>
<p>Add support for Python 3.11.</p>
</li>
<li>
<p>Add support for pytest 7.0, 7.1, 7.2.</p>
</li>
</ul>
<h2>10.2 (2021-09-17)</h2>
<p>Features
++++++++</p>
<ul>
<li>Allow recovery from crashed tests with pytest-xdist.</li>
<li>Add support for Python 3.10 (as of Python 3.10.rc2).
(Thanks to <code>`@hugovk` &lt;https://github.com/hugovk&gt;</code>_ for the PR.)</li>
</ul>
<h2>10.1 (2021-07-02)</h2>
<p>Features
++++++++</p>
<ul>
<li>Allows using a <code>str</code> as condition for
<code>`@pytest.mark.flaky(condition)</code>`
which gets evaluated dynamically similarly to
<code>`@pytest.mark.skipif(condition)</code>.`
(<code>[#162](pytest-dev/pytest-rerunfailures#162) &lt;https://github.com/pytest-dev/pytest-rerunfailures/pull/162&gt;</code>_</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pytest-dev/pytest-rerunfailures/commit/4dc493befc4323310b568e461ad184881c0459d1"><code>4dc493b</code></a> Preparing release 11.0</li>
<li><a href="https://github.com/pytest-dev/pytest-rerunfailures/commit/3ffda7fad457fd6518915d0c2806b26566ba2b73"><code>3ffda7f</code></a> fix: don't bind all ips (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-rerunfailures/issues/201">#201</a>)</li>
<li><a href="https://github.com/pytest-dev/pytest-rerunfailures/commit/737183cb61c279292ed3a19c0b4655e64b0b4040"><code>737183c</code></a> Update dependencies: (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-rerunfailures/issues/202">#202</a>)</li>
<li>See full diff in <a href="https://github.com/pytest-dev/pytest-rerunfailures/compare/10.3...11.0">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-rerunfailures&package-manager=pip&previous-version=10.3&new-version=11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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: Jens H. Nielsen <Jens.Nielsen@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@bors
Copy link
Contributor

bors bot commented Jan 13, 2023

Build failed (retrying...):

bors bot added a commit that referenced this pull request Jan 13, 2023
4923: Move VoltageDivider into parameters and deprecate r=jenshnielsen a=jenshnielsen

This is not an instrument but a Parameter so it makes more sense for it to live there. 
Since DelegateParamerer does the same more general and better deprecate this one

Co-authored-by: Jens H. Nielsen <Jens.Nielsen@microsoft.com>
@bors
Copy link
Contributor

bors bot commented Jan 13, 2023

Build failed:

@jenshnielsen jenshnielsen merged commit a9084b2 into microsoft:master Jan 13, 2023
@jenshnielsen jenshnielsen deleted the driver/move_device branch January 13, 2023 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants