Skip to content

Commit

Permalink
Merge #4017 #4022
Browse files Browse the repository at this point in the history
4017: Bump akaihola/darker from 1.4.1 to 1.4.2 r=jenshnielsen a=dependabot[bot]

Bumps [akaihola/darker](https://github.com/akaihola/darker) from 1.4.1 to 1.4.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/akaihola/darker/releases">akaihola/darker's releases</a>.</em></p>
<blockquote>
<h2>Version 1.4.2</h2>
<h2>Added</h2>
<ul>
<li>Document <code>isort</code>'s requirement to be run in the same environment as
the modules which are processed.</li>
<li>Document VSCode and <code>--lint</code>/<code>-L</code> incompatibility in the README.</li>
<li>Guard against breaking changes in <code>isort</code> by testing against its <code>main</code>
branch in the <code>test-future</code> GitHub Workflow.</li>
<li><code>release_tools/bump_version.py</code> script for incrementing version numbers and
milestone numbers in various files when releasing.</li>
</ul>
<h2>Fixed</h2>
<ul>
<li>Fix NixOS builds when <code>pytest-darker</code> calls <code>pylint</code>. Needed to activate
the virtualenv.</li>
<li>Allow more time to pass when checking file modification times in a unit test.
Windows tests on GitHub are sometimes really slow.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/akaihola/darker/blob/master/CHANGES.rst">akaihola/darker's changelog</a>.</em></p>
<blockquote>
<h1>1.4.2_ - 2022-03-12</h1>
<h2>Added</h2>
<ul>
<li>Document <code>isort</code>'s requirement to be run in the same environment as
the modules which are processed.</li>
<li>Document VSCode and <code>--lint</code>/<code>-L</code> incompatibility in the README.</li>
<li>Guard against breaking changes in <code>isort</code> by testing against its <code>main</code>
branch in the <code>test-future</code> GitHub Workflow.</li>
<li><code>release_tools/bump_version.py</code> script for incrementing version numbers and
milestone numbers in various files when releasing.</li>
</ul>
<h2>Fixed</h2>
<ul>
<li>Fix NixOS builds when <code>pytest-darker</code> calls <code>pylint</code>. Needed to activate
the virtualenv.</li>
<li>Allow more time to pass when checking file modification times in a unit test.
Windows tests on GitHub are sometimes really slow.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/akaihola/darker/commit/a1fe70fb5e067d5ae28350f5c02d51650c8ccb37"><code>a1fe70f</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/akaihola/darker/issues/332">#332</a> from akaihola/release-1.4.2</li>
<li><a href="https://github.com/akaihola/darker/commit/3cc9ac085b8e16d4b44605386a30bcbf5a5f71d6"><code>3cc9ac0</code></a> Last-minute fixes to <code>bump_version.py</code> script</li>
<li><a href="https://github.com/akaihola/darker/commit/0d3f8d60756cdc773d1494f0207e5a0d21c127b4"><code>0d3f8d6</code></a> Bump version number to 1.4.2</li>
<li><a href="https://github.com/akaihola/darker/commit/fb7243eaa29b4eb33cece33c7d84041fd8070b78"><code>fb7243e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/akaihola/darker/issues/333">#333</a> from akaihola/contributors-2022-03</li>
<li><a href="https://github.com/akaihola/darker/commit/f92226ba79bcdc1399fd6398927c5aeb55663358"><code>f92226b</code></a> Add <a href="https://github.com/tobiasdiez"><code>`@​tobiasdiez</code></a>` as a contributor</li>
<li><a href="https://github.com/akaihola/darker/commit/5174ce5503f94007516c6af893a322fd8bae8896"><code>5174ce5</code></a> Add <a href="https://github.com/dhrvjha"><code>`@​dhrvjha</code></a>` as a contributor</li>
<li><a href="https://github.com/akaihola/darker/commit/60bd37b57a472f9b03444c31f23079c2d0db2599"><code>60bd37b</code></a> Add new link type &quot;search issues&quot;</li>
<li><a href="https://github.com/akaihola/darker/commit/da6672213605445c56c2b7e4cc29484384647060"><code>da66722</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/akaihola/darker/issues/329">#329</a> from akaihola/bump-version</li>
<li><a href="https://github.com/akaihola/darker/commit/ac4f058d476f05217cdb4301fcdbcfc3ea8f81bb"><code>ac4f058</code></a> Skip Pylint on Python&lt;3.9</li>
<li><a href="https://github.com/akaihola/darker/commit/ae2dcede0919b8169b9df2b64d62f2fd15239360"><code>ae2dced</code></a> Update change log</li>
<li>Additional commits viewable in <a href="https://github.com/akaihola/darker/compare/1.4.1...1.4.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=akaihola/darker&package-manager=github_actions&previous-version=1.4.1&new-version=1.4.2)](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>

4022: Bump notebook from 6.4.8 to 6.4.9 r=jenshnielsen a=dependabot[bot]

Bumps [notebook](http://jupyter.org) from 6.4.8 to 6.4.9.


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=notebook&package-manager=pip&previous-version=6.4.8&new-version=6.4.9)](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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jens H. Nielsen <Jens.Nielsen@microsoft.com>
  • Loading branch information
3 people committed Mar 15, 2022
3 parents f7fc05c + d05e12b + 1595677 commit e5e233f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/darker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ jobs:
- uses: actions/checkout@v3.0.0
with:
fetch-depth: 0
- uses: akaihola/darker@1.4.1
- uses: akaihola/darker@1.4.2
with:
options: "--check --diff"
src: "./qcodes"
revision: "origin/master..."
version: "1.4.1"
2 changes: 1 addition & 1 deletion docs_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ nbconvert==6.4.4
nbformat==5.2.0
nbsphinx==0.8.8
nest-asyncio==1.5.4
notebook==6.4.8
notebook==6.4.9
numpy~=1.21.5; python_version<'3.8'
numpy~=1.22.3; python_version>='3.8'
packaging==21.3
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ nbclient~=0.5.13
nbconvert~=6.4.4
nbformat~=5.2.0
nest-asyncio~=1.5.4
notebook~=6.4.8
notebook~=6.4.9
numpy~=1.21.5; python_version<'3.8'
numpy~=1.22.3; python_version>='3.8'
opencensus~=0.8.0
Expand Down

0 comments on commit e5e233f

Please sign in to comment.