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

Driver/decadaf fine mode #829

Closed
wants to merge 358 commits into from

Conversation

nataliejpg
Copy link
Contributor

Fixes #issuenumber.

Changes proposed in this pull request:

@mention one core developer

nataliejpg and others added 30 commits February 7, 2017 16:22
…ssary and doing most of rec_samp controller and buf_rec controller
This is a non related change. Will go in on a different pr
This reverts commit e8190ec.
nataliejpg and others added 24 commits August 30, 2017 09:02
@jenshnielsen
Copy link
Collaborator

Duplicate of #826 I think. Please ping if you disagree

@nataliejpg
Copy link
Contributor Author

yep sounds about right, would be good to test #826 with main qcodes and an actual instrument before measuring just because I am paranoid.

@jenshnielsen
Copy link
Collaborator

Sure. #826 is the change that I wrote with @ThorvaldLarsen on a clean branch but lets test it

@nataliejpg nataliejpg deleted the driver/Decadaf_fine_mode branch December 10, 2018 14:27
bors bot added a commit that referenced this pull request Oct 26, 2022
4767: Update pytest-xdist requirement from ~=2.5.0 to ~=3.0.2 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) to permit the latest version.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst">pytest-xdist's changelog</a>.</em></p>
<blockquote>
<h1>pytest-xdist 3.0.2 (2022-10-25)</h1>
<h2>Bug Fixes</h2>
<ul>
<li><code>[#813](pytest-dev/pytest-xdist#813) &lt;https://github.com/pytest-dev/pytest-xdist/issues/813&gt;</code>_: Cancel shutdown when a crashed worker is restarted.</li>
</ul>
<h2>Deprecations</h2>
<ul>
<li>
<p><code>[#825](pytest-dev/pytest-xdist#825) &lt;https://github.com/pytest-dev/pytest-xdist/issues/825&gt;</code>_: The <code>--rsyncdir</code> command line argument and <code>rsyncdirs</code> config variable are deprecated.</p>
<p>The rsync feature will be removed in pytest-xdist 4.0.</p>
</li>
<li>
<p><code>[#826](pytest-dev/pytest-xdist#826) &lt;https://github.com/pytest-dev/pytest-xdist/issues/826&gt;</code>_: The <code>--looponfail</code> command line argument and <code>looponfailroots</code> config variable are deprecated.</p>
<p>The loop-on-fail feature will be removed in pytest-xdist 4.0.</p>
</li>
</ul>
<h2>Improved Documentation</h2>
<ul>
<li>
<p><code>[#791](pytest-dev/pytest-xdist#791) &lt;https://github.com/pytest-dev/pytest-xdist/issues/791&gt;</code>_: Document the <code>pytest_xdist_auto_num_workers</code> hook.</p>
</li>
<li>
<p><code>[#796](pytest-dev/pytest-xdist#796) &lt;https://github.com/pytest-dev/pytest-xdist/issues/796&gt;</code>_: Added known limitations section to documentation.</p>
</li>
<li>
<p><code>[#829](pytest-dev/pytest-xdist#829) &lt;https://github.com/pytest-dev/pytest-xdist/issues/829&gt;</code>_: Document the <code>-n logical</code> option.</p>
</li>
</ul>
<h2>Features</h2>
<ul>
<li>
<p><code>[#792](pytest-dev/pytest-xdist#792) &lt;https://github.com/pytest-dev/pytest-xdist/issues/792&gt;</code>_: The environment variable <code>PYTEST_XDIST_AUTO_NUM_WORKERS</code> can now be used to
specify the default for <code>-n auto</code> and <code>-n logical</code>.</p>
</li>
<li>
<p><code>[#812](pytest-dev/pytest-xdist#812) &lt;https://github.com/pytest-dev/pytest-xdist/issues/812&gt;</code>_: Partially restore old initial batch distribution algorithm in <code>LoadScheduling</code>.</p>
<p>pytest orders tests for optimal sequential execution - i. e. avoiding
unnecessary setup and teardown of fixtures. So executing tests in consecutive
chunks is important for optimal performance.</p>
<p>In v1.14, initial test distribution in <code>LoadScheduling</code> was changed to
round-robin, optimized for the corner case, when the number of tests is less
than <code>2 * number of nodes</code>. At the same time, it became worse for all other
cases.</p>
<p>For example: if some tests use some &quot;heavy&quot; fixture, and these tests fit into
the initial batch, with round-robin distribution the fixture will be created</p>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/eed37d4771f7379156303f63e0d09131f1ac8dee"><code>eed37d4</code></a> Update CHANGELOG</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/3e9284b6e0b474acaf6f25f8f8db68c78c9cd187"><code>3e9284b</code></a> Merge remote-tracking branch 'upstream/master' into release-3.0.0</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/ccdab727a29cef7075b853e550eb03aa8de076c1"><code>ccdab72</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-xdist/issues/831">#831</a> from pytest-dev/fix-setup</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/0c981d35475ab6eaee2e6a5ead44442bf07d6e61"><code>0c981d3</code></a> fix and update packaging</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/38dcf52ae69188b0249eb6307fe6745e2e4174dc"><code>38dcf52</code></a> Release 3.0.1</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/f2633f1b372dbc58a221cd612c9cb4e79f59eea3"><code>f2633f1</code></a> Fetch all tags, as required by setuptools-scm</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/192193197bee27228e1e4b44855b3777397e31e5"><code>1921931</code></a> Update CHANGELOG for 3.0</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/0f58a14def50b9b9112ec25cef97b9593ce86b8a"><code>0f58a14</code></a> Fix towncrier command for latest version</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/bd23c2460f00129fa0ace7151c8ae18c0a70d5ad"><code>bd23c24</code></a> Fix changelog fragments</li>
<li><a href="https://github.com/pytest-dev/pytest-xdist/commit/794f28bcf4a3711acd074e9637ce8674fb6215be"><code>794f28b</code></a> Use modern syntax for towncrier</li>
<li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-xdist/compare/v2.5.0...v3.0.2">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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
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.

5 participants