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

Make export configurable #3586

Merged
merged 12 commits into from
Nov 16, 2021
Merged

Conversation

jenshnielsen
Copy link
Collaborator

@jenshnielsen jenshnielsen commented Nov 15, 2021

This makes it possible to configure the exported name. So far it is possible to include captured_run_id and guid.

  • Should we include other elements now or wait
  • Should we change the default to include guid?

This is technically an api break since it now uses captured_run_id and not run_id but I do think that is for the better.

@jenshnielsen jenshnielsen added this to the 0.30.0 milestone Nov 15, 2021
@codecov
Copy link

codecov bot commented Nov 15, 2021

Codecov Report

Merging #3586 (78cebac) into master (f9b3edd) will increase coverage by 0.00%.
The diff coverage is 88.88%.

@@           Coverage Diff           @@
##           master    #3586   +/-   ##
=======================================
  Coverage   65.69%   65.70%           
=======================================
  Files         225      225           
  Lines       30465    30470    +5     
=======================================
+ Hits        20014    20019    +5     
  Misses      10451    10451           

@astafan8
Copy link
Contributor

Should we include other elements now or wait

i'd vote for including :) at least smaple name, exp name, ds name, started ts .

Should we change the default to include guid?

definitely!

This is technically an api break since it now uses captured_run_id and not run_id but I do think that is for the better.

agree! we could consider this a bug fix.

qcodes/configuration/qcodesrc_schema.json Outdated Show resolved Hide resolved
@jenshnielsen
Copy link
Collaborator Author

bors merge

@bors
Copy link
Contributor

bors bot commented Nov 15, 2021

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@jenshnielsen
Copy link
Collaborator Author

bors r-

@jenshnielsen
Copy link
Collaborator Author

need to write a changelog entry

@jenshnielsen
Copy link
Collaborator Author

bors r+

@bors
Copy link
Contributor

bors bot commented Nov 15, 2021

🕐 Waiting for PR status (Github check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

@jenshnielsen
Copy link
Collaborator Author

bors merge

bors bot added a commit that referenced this pull request Nov 16, 2021
3586: Make export configurable r=jenshnielsen a=jenshnielsen

This makes it possible to configure the exported name. So far it is possible to include captured_run_id and guid. 

- [x] Should we include other elements now or wait
- [x] Should we change the default to include guid?

This is technically an api break since it now uses captured_run_id and not run_id but I do think that is for the better. 

<!--

Thanks for submitting a pull request against QCoDeS.

To help us effectively merge your pr please consider the following check list.

- [ ] Make sure that the pull request contains a short description of the changes made.
- [ ] If you are submitting a new feature please document it. This can be in the form of inline
      docstrings, an example notebook or restructured text files.
- [ ] Please include automatic tests for the changes made when possible.

Unless your change is a small or trivial fix please add a small changelog entry:

- [ ] Create a file in the docs\changes\newsfragments folder with a short description of the change.

This file should be in the format number.categoryofcontribution. Here the number should either be the number
of the pull request. To get the number of the pull request one must
first the pull request and then subsequently update the number. The category of contribution should be
one of ``breaking``, ``new``, ``improved``, ``new_driver`` ``improved_driver``, ``underthehood``.

If this fixes a known bug reported against QCoDeS:

- [ ] Please include a string in the following form ``closes #xxx`` where ``xxx``` is the number of the bug fixed.

Please have a look at [the contributing guide](https://qcodes.github.io/Qcodes/community/contributing.html)
for more information.

If you are in doubt about any of this please ask and we will be happy to help.

-->


3588: Bump sphinx-jsonschema from 1.16.11 to 1.17.1 r=jenshnielsen a=dependabot[bot]

Bumps [sphinx-jsonschema](https://github.com/lnoor/sphinx-jsonschema) from 1.16.11 to 1.17.1.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/lnoor/sphinx-jsonschema/commits/v1.17.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sphinx-jsonschema&package-manager=pip&previous-version=1.16.11&new-version=1.17.1)](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>

3589: Bump pywinpty from 1.1.5 to 1.1.6 r=jenshnielsen a=dependabot[bot]

Bumps [pywinpty](https://github.com/spyder-ide/pywinpty) from 1.1.5 to 1.1.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/spyder-ide/pywinpty/releases">pywinpty's releases</a>.</em></p>
<blockquote>
<h2>PyWinpty release v1.1.6</h2>
<p>Minor release that improves the support on arm64 (although not tested) and re-enables support for win32 builds, thanks to <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` and <a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a>.` Also, some Rust dependencies were updated to their latest versions.</p>
<h2>What's Changed</h2>
<ul>
<li>enable building pywinpty without winpty and debug code by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/198">spyder-ide/pywinpty#198</a></li>
<li>Fix compile error C2664 on win32 by <a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/192">spyder-ide/pywinpty#192</a></li>
<li>Update pyo3 requirement from 0.14.1 to 0.15.0 by <a href="https://github.com/dependabot"><code>`@​dependabot</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/194">spyder-ide/pywinpty#194</a></li>
<li>add support for arm64 compilation by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/199">spyder-ide/pywinpty#199</a></li>
<li>Update windows requirement from 0.21.1 to 0.26.0 in /findlib by <a href="https://github.com/dependabot"><code>`@​dependabot</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/196">spyder-ide/pywinpty#196</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/198">spyder-ide/pywinpty#198</a></li>
<li><a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/192">spyder-ide/pywinpty#192</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/spyder-ide/pywinpty/blob/master/CHANGELOG.md#version-116-2021-11-15">https://github.com/spyder-ide/pywinpty/blob/master/CHANGELOG.md#version-116-2021-11-15</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/spyder-ide/pywinpty/blob/master/CHANGELOG.md">pywinpty's changelog</a>.</em></p>
<blockquote>
<h2>Version 1.1.6 (2021-11-15)</h2>
<h3>Issues Closed</h3>
<ul>
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/201">Issue 201</a> - Release v1.1.6</li>
</ul>
<p>In this release 1 issue was closed.</p>
<h3>Pull Requests Merged</h3>
<ul>
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/199">PR 199</a> - add support for arm64 compilation, by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/198">PR 198</a> - enable building pywinpty without winpty and debug code, by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/196">PR 196</a> - Update windows requirement from 0.21.1 to 0.26.0 in /findlib, by <a href="https://github.com/apps/dependabot"><code>`@​dependabot[bot]</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/194">PR 194</a> - Update pyo3 requirement from 0.14.1 to 0.15.0, by <a href="https://github.com/apps/dependabot"><code>`@​dependabot[bot]</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/192">PR 192</a> - Fix compile error C2664 on win32, by <a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a></li>`
</ul>
<p>In this release 5 pull requests were closed.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/e5a83fa13f2134d3aa836c0c85b97bd2b53f4fc2"><code>e5a83fa</code></a> Release v1.1.6</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/2f68f21ab91fa6eff2464d127ad30a8a68cded4c"><code>2f68f21</code></a> Update Changelog</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/c2a40478c9228aa995564c517b613eb44df4edc7"><code>c2a4047</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/196">#196</a> from spyder-ide/dependabot/cargo/findlib/windows-0.26.0</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/22b238e62dde7ce1fc930d3a2383412700fc6390"><code>22b238e</code></a> Mark test_ptyprocess::test_isalive as xfail</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/e7841a8b6fa3f80f67e7d5986e20dfe2f7ce10e1"><code>e7841a8</code></a> Convert to pwstr/pstr</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/057e97efe53e3f4a59a4664e849daa31e4978085"><code>057e97e</code></a> Add Win32_Foundation as feature</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/4512fa4a2a921666a63d1bd15a6d4831638a4c2f"><code>4512fa4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/199">#199</a> from nsait-linaro/enable_arm64</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/450010d51882311bb57daf467512260bda8909c3"><code>450010d</code></a> Delete findlib</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/b4359982c8245a4298aa061f5081a45f94160bb6"><code>b435998</code></a> Migrate to new Windows version</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/73955e452cf8e30f3e9d103e92f19bfc7a4562bb"><code>73955e4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/194">#194</a> from spyder-ide/dependabot/cargo/pyo3-0.15.0</li>
<li>Additional commits viewable in <a href="https://github.com/spyder-ide/pywinpty/compare/v1.1.5...v1.1.6">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pywinpty&package-manager=pip&previous-version=1.1.5&new-version=1.1.6)](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: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Co-authored-by: Jens Hedegaard Nielsen <Jens.Nielsen@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@bors
Copy link
Contributor

bors bot commented Nov 16, 2021

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"Required status check \"pre-commit.ci - pr\" is expected.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@jenshnielsen
Copy link
Collaborator Author

bors merge

bors bot added a commit that referenced this pull request Nov 16, 2021
3586: Make export configurable r=jenshnielsen a=jenshnielsen

This makes it possible to configure the exported name. So far it is possible to include captured_run_id and guid. 

- [x] Should we include other elements now or wait
- [x] Should we change the default to include guid?

This is technically an api break since it now uses captured_run_id and not run_id but I do think that is for the better. 

<!--

Thanks for submitting a pull request against QCoDeS.

To help us effectively merge your pr please consider the following check list.

- [ ] Make sure that the pull request contains a short description of the changes made.
- [ ] If you are submitting a new feature please document it. This can be in the form of inline
      docstrings, an example notebook or restructured text files.
- [ ] Please include automatic tests for the changes made when possible.

Unless your change is a small or trivial fix please add a small changelog entry:

- [ ] Create a file in the docs\changes\newsfragments folder with a short description of the change.

This file should be in the format number.categoryofcontribution. Here the number should either be the number
of the pull request. To get the number of the pull request one must
first the pull request and then subsequently update the number. The category of contribution should be
one of ``breaking``, ``new``, ``improved``, ``new_driver`` ``improved_driver``, ``underthehood``.

If this fixes a known bug reported against QCoDeS:

- [ ] Please include a string in the following form ``closes #xxx`` where ``xxx``` is the number of the bug fixed.

Please have a look at [the contributing guide](https://qcodes.github.io/Qcodes/community/contributing.html)
for more information.

If you are in doubt about any of this please ask and we will be happy to help.

-->


3588: Bump sphinx-jsonschema from 1.16.11 to 1.17.1 r=jenshnielsen a=dependabot[bot]

Bumps [sphinx-jsonschema](https://github.com/lnoor/sphinx-jsonschema) from 1.16.11 to 1.17.1.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/lnoor/sphinx-jsonschema/commits/v1.17.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sphinx-jsonschema&package-manager=pip&previous-version=1.16.11&new-version=1.17.1)](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>

3589: Bump pywinpty from 1.1.5 to 1.1.6 r=jenshnielsen a=dependabot[bot]

Bumps [pywinpty](https://github.com/spyder-ide/pywinpty) from 1.1.5 to 1.1.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/spyder-ide/pywinpty/releases">pywinpty's releases</a>.</em></p>
<blockquote>
<h2>PyWinpty release v1.1.6</h2>
<p>Minor release that improves the support on arm64 (although not tested) and re-enables support for win32 builds, thanks to <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` and <a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a>.` Also, some Rust dependencies were updated to their latest versions.</p>
<h2>What's Changed</h2>
<ul>
<li>enable building pywinpty without winpty and debug code by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/198">spyder-ide/pywinpty#198</a></li>
<li>Fix compile error C2664 on win32 by <a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/192">spyder-ide/pywinpty#192</a></li>
<li>Update pyo3 requirement from 0.14.1 to 0.15.0 by <a href="https://github.com/dependabot"><code>`@​dependabot</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/194">spyder-ide/pywinpty#194</a></li>
<li>add support for arm64 compilation by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/199">spyder-ide/pywinpty#199</a></li>
<li>Update windows requirement from 0.21.1 to 0.26.0 in /findlib by <a href="https://github.com/dependabot"><code>`@​dependabot</code></a>` in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/196">spyder-ide/pywinpty#196</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/198">spyder-ide/pywinpty#198</a></li>
<li><a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a>` made their first contribution in <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/192">spyder-ide/pywinpty#192</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/spyder-ide/pywinpty/blob/master/CHANGELOG.md#version-116-2021-11-15">https://github.com/spyder-ide/pywinpty/blob/master/CHANGELOG.md#version-116-2021-11-15</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/spyder-ide/pywinpty/blob/master/CHANGELOG.md">pywinpty's changelog</a>.</em></p>
<blockquote>
<h2>Version 1.1.6 (2021-11-15)</h2>
<h3>Issues Closed</h3>
<ul>
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/201">Issue 201</a> - Release v1.1.6</li>
</ul>
<p>In this release 1 issue was closed.</p>
<h3>Pull Requests Merged</h3>
<ul>
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/199">PR 199</a> - add support for arm64 compilation, by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/198">PR 198</a> - enable building pywinpty without winpty and debug code, by <a href="https://github.com/nsait-linaro"><code>`@​nsait-linaro</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/196">PR 196</a> - Update windows requirement from 0.21.1 to 0.26.0 in /findlib, by <a href="https://github.com/apps/dependabot"><code>`@​dependabot[bot]</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/194">PR 194</a> - Update pyo3 requirement from 0.14.1 to 0.15.0, by <a href="https://github.com/apps/dependabot"><code>`@​dependabot[bot]</code></a></li>`
<li><a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/pull/192">PR 192</a> - Fix compile error C2664 on win32, by <a href="https://github.com/cgohlke"><code>`@​cgohlke</code></a></li>`
</ul>
<p>In this release 5 pull requests were closed.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/e5a83fa13f2134d3aa836c0c85b97bd2b53f4fc2"><code>e5a83fa</code></a> Release v1.1.6</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/2f68f21ab91fa6eff2464d127ad30a8a68cded4c"><code>2f68f21</code></a> Update Changelog</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/c2a40478c9228aa995564c517b613eb44df4edc7"><code>c2a4047</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/196">#196</a> from spyder-ide/dependabot/cargo/findlib/windows-0.26.0</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/22b238e62dde7ce1fc930d3a2383412700fc6390"><code>22b238e</code></a> Mark test_ptyprocess::test_isalive as xfail</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/e7841a8b6fa3f80f67e7d5986e20dfe2f7ce10e1"><code>e7841a8</code></a> Convert to pwstr/pstr</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/057e97efe53e3f4a59a4664e849daa31e4978085"><code>057e97e</code></a> Add Win32_Foundation as feature</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/4512fa4a2a921666a63d1bd15a6d4831638a4c2f"><code>4512fa4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/199">#199</a> from nsait-linaro/enable_arm64</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/450010d51882311bb57daf467512260bda8909c3"><code>450010d</code></a> Delete findlib</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/b4359982c8245a4298aa061f5081a45f94160bb6"><code>b435998</code></a> Migrate to new Windows version</li>
<li><a href="https://github.com/spyder-ide/pywinpty/commit/73955e452cf8e30f3e9d103e92f19bfc7a4562bb"><code>73955e4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/spyder-ide/pywinpty/issues/194">#194</a> from spyder-ide/dependabot/cargo/pyo3-0.15.0</li>
<li>Additional commits viewable in <a href="https://github.com/spyder-ide/pywinpty/compare/v1.1.5...v1.1.6">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pywinpty&package-manager=pip&previous-version=1.1.5&new-version=1.1.6)](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: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Co-authored-by: Jens Hedegaard Nielsen <Jens.Nielsen@microsoft.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@bors
Copy link
Contributor

bors bot commented Nov 16, 2021

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"Required status check \"pre-commit.ci - pr\" is expected.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@jenshnielsen
Copy link
Collaborator Author

bors merge

@bors bors bot merged commit 21e91c7 into microsoft:master Nov 16, 2021
@jenshnielsen jenshnielsen deleted the make_export_configurable branch November 16, 2021 09:23
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