Skip to content

Commit

Permalink
Merge #4310
Browse files Browse the repository at this point in the history
4310: Bump pytest-mock from 3.7.0 to 3.8.1 r=jenshnielsen a=dependabot[bot]

Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 3.7.0 to 3.8.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/releases">pytest-mock's releases</a>.</em></p>
<blockquote>
<h2>v3.8.1</h2>
<h1>Releases</h1>
<h2>3.8.1 (2022-06-24)</h2>
<ul>
<li>Fix regression caused by an explicit <code>mock</code> dependency in the code (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">#298</a>).</li>
</ul>
<h2>3.8.0 (2022-06-24)</h2>
<ul>
<li>Add <code>MockerFixture.async_mock</code> method. Thanks <a href="https://github.com/PerchunPak"><code>`@​PerchunPak</code></a>` for the PR (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/296">#296</a>).</li>
</ul>
<h2>3.7.0 (2022-01-28)</h2>
<ul>
<li>Python 3.10 now officially supported.</li>
<li>Dropped support for Python 3.6.</li>
</ul>
<h2>3.6.1 (2021-05-06)</h2>
<ul>
<li>Fix <code>mocker.resetall()</code> when using <code>mocker.spy()</code> (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/237">#237</a>). Thanks <a href="https://github.com/blaxter"><code>`@​blaxter</code></a>` for the report and <a href="https://github.com/shadycuz"><code>`@​shadycuz</code></a>` for the PR.</li>
</ul>
<h2>3.6.0 (2021-04-24)</h2>
<ul>
<li>pytest-mock no longer supports Python 3.5.</li>
<li>Correct type annotations for <code>mocker.patch.object</code> to also include the string form.
Thanks <a href="https://github.com/plannigan"><code>`@​plannigan</code></a>` for the PR (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/235">#235</a>).</li>
<li><code>reset_all</code> now supports <code>return_value</code> and <code>side_effect</code> keyword arguments. Thanks <a href="https://github.com/alex-marty"><code>`@​alex-marty</code></a>` for the PR (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/214">#214</a>).</li>
</ul>
<h2>3.5.1 (2021-01-10)</h2>
<ul>
<li>Use <code>inspect.getattr_static</code> instead of resorting to <code>object.__getattribute__</code>
magic. This should better comply with objects which implement a custom descriptor
protocol. Thanks <a href="https://github.com/yesthesoup"><code>`@​yesthesoup</code></a>` for the PR (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/224">#224</a>).</li>
</ul>
<h2>3.5.0 (2021-01-04)</h2>
<ul>
<li>Now all patch functions will emit a warning instead of raising a <code>ValueError</code> when used
as a context-manager. Thanks <a href="https://github.com/iforapsy"><code>`@​iforapsy</code></a>` for the PR (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/221">#221</a>).</li>
<li>Additionally, <code>mocker.patch.context_manager</code> is available when the user intends to mock
a context manager (for example <code>threading.Lock</code> object), which will not emit that
warning.</li>
</ul>
<p>3.4.0 (2020-12-15)</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/pytest-dev/pytest-mock/blob/main/CHANGELOG.rst">pytest-mock's changelog</a>.</em></p>
<blockquote>
<h2>3.8.1 (2022-06-24)</h2>
<ul>
<li>Fix regression caused by an explicit <code>mock</code> dependency in the code (<code>[#298](https://github.com/pytest-dev/pytest-mock/issues/298)</code>_).</li>
</ul>
<p>.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">#298</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/298">pytest-dev/pytest-mock#298</a></p>
<h2>3.8.0 (2022-06-24)</h2>
<ul>
<li>Add <code>MockerFixture.async_mock</code> method. Thanks <code>`@PerchunPak</code>_` for the PR (<code>[#296](https://github.com/pytest-dev/pytest-mock/issues/296)</code>_).</li>
</ul>
<p>.. _<a href="https://github.com/PerchunPak"><code>`@​PerchunPak</code></a>:` <a href="https://github.com/PerchunPak">https://github.com/PerchunPak</a>
.. _<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/296">#296</a>: <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/pull/296">pytest-dev/pytest-mock#296</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/726143335742228d3a611448983979a50c8c29ac"><code>7261433</code></a> Fix regression due to 'mock' import</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/6ce9a78b9f68d4e4dfcd533e07fd88678cf8d052"><code>6ce9a78</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/297">#297</a> from nicoddemus/release-3.8.0</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/7eb90d8c0115357c4f2857b25c4bc57722d3a313"><code>7eb90d8</code></a> Release 3.8.0</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/7cc4cec0531b7751f4e73cbbb73009c169d3c531"><code>7cc4cec</code></a> Add <code>async_stub</code> method (<a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/296">#296</a>)</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/6030ef2b43bf5e23bde8d9a631a7c655e5106574"><code>6030ef2</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/294">#294</a> from pytest-dev/pre-commit-ci-update-config</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/95547ee9acf173fb4abff347475422ff972b90c3"><code>95547ee</code></a> [pre-commit.ci] pre-commit autoupdate</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/5b392f468630242a0eb55d93a70bd4d14f919443"><code>5b392f4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/pytest-dev/pytest-mock/issues/291">#291</a> from pytest-dev/pre-commit-ci-update-config</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/2321b621b7cc4efd205a3ebc70f00a4b246f802c"><code>2321b62</code></a> [pre-commit.ci] auto fixes from pre-commit.com hooks</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/951628e8c7f04053c91e95a690491634f85feed0"><code>951628e</code></a> [pre-commit.ci] pre-commit autoupdate</li>
<li><a href="https://github.com/pytest-dev/pytest-mock/commit/3394e1162842567d9aa7ae0a2f208acbe8ba3299"><code>3394e11</code></a> Fix docs badge</li>
<li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-mock/compare/v3.7.0...v3.8.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-mock&package-manager=pip&previous-version=3.7.0&new-version=3.8.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot[bot] authored Jun 27, 2022
2 parents 77777aa + 0e20dfa commit 31397e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pyparsing==3.0.9
pytest==7.1.2
pytest-cov==3.0.0
pytest-forked==1.4.0
pytest-mock==3.7.0
pytest-mock==3.8.1
pytest-rerunfailures==10.2
pytest-xdist==2.5.0
PyVISA==1.11.3
Expand Down

0 comments on commit 31397e4

Please sign in to comment.