Skip to content

Commit

Permalink
Merge #4737 #4738 #4739
Browse files Browse the repository at this point in the history
4737: Update protobuf requirement from ~=4.21.7 to ~=4.21.8 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [protobuf](https://github.com/protocolbuffers/protobuf) to permit the latest version.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/protocolbuffers/protobuf/commits">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>

4738: Update portalocker requirement from ~=2.5.1 to ~=2.6.0 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [portalocker](https://github.com/WoLpH/portalocker) to permit the latest version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/WoLpH/portalocker/releases">portalocker's releases</a>.</em></p>
<blockquote>
<h2>v2.6.0</h2>
<p>Added fileno() support. Fixes <a href="https://github-redirect.dependabot.com/WoLpH/portalocker/issues/80">#80</a> on posix systems</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/WoLpH/portalocker/blob/develop/CHANGELOG.rst">portalocker's changelog</a>.</em></p>
<blockquote>
<p>For newer changes please look at the comments for the Git tags:
<a href="https://github.com/WoLpH/portalocker/tags">https://github.com/WoLpH/portalocker/tags</a></p>
<p>For more details the commit log for the master branch could be useful:
<a href="https://github.com/WoLpH/portalocker/commits/master">https://github.com/WoLpH/portalocker/commits/master</a></p>
<p>1.5:</p>
<ul>
<li>Moved tests to prevent collisions with other packages</li>
</ul>
<p>1.4:</p>
<ul>
<li>Added optional file open parameters</li>
</ul>
<p>1.3:</p>
<ul>
<li>Improved documentation</li>
<li>Added file handle to locking exceptions</li>
</ul>
<p>1.2:</p>
<ul>
<li>Added signed releases and tags to PyPI and Git</li>
</ul>
<p>1.1:</p>
<ul>
<li>Added support for Python 3.6+</li>
<li>Using real time to calculate timeout</li>
</ul>
<p>1.0:</p>
<ul>
<li>
<p>Complete code refactor.</p>
<ul>
<li>Splitting of code in logical classes</li>
<li>100% test coverage and change in API behaviour</li>
<li>The default behavior of the <code>Lock</code> class has changed to append instead of
write/truncate.</li>
</ul>
</li>
</ul>
<p>0.6:</p>
<ul>
<li>Added msvcrt support for Windows</li>
</ul>
<p>0.5:</p>
<ul>
<li>Python 3 support</li>
</ul>
<p>0.4:</p>
<ul>
<li>Fixing a few bugs, added coveralls support, switched to py.test and added
100% test coverage.</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/WoLpH/portalocker/commit/6a0d82810007321d91480ee83ca25789a2659c77"><code>6a0d828</code></a> Merge branch 'release/2.6.0'</li>
<li><a href="https://github.com/WoLpH/portalocker/commit/faf78f15528edf05efadb885bb81ca32372a6496"><code>faf78f1</code></a> Incrementing version to v2.6.0</li>
<li><a href="https://github.com/WoLpH/portalocker/commit/568d213bae9fa2ea8861117f3a83507865fff1df"><code>568d213</code></a> Added fileno() support. Fixes <a href="https://github-redirect.dependabot.com/WoLpH/portalocker/issues/80">#80</a> on posix systems</li>
<li><a href="https://github.com/WoLpH/portalocker/commit/26a1522520f0d8b656db210117fcdcbf6c526ede"><code>26a1522</code></a> testing fix for <a href="https://github-redirect.dependabot.com/WoLpH/portalocker/issues/80">#80</a></li>
<li><a href="https://github.com/WoLpH/portalocker/commit/35b500bb6fecdffd372b0022e417baa210a88462"><code>35b500b</code></a> Updated license to 3-clause BSD License. Fixes <a href="https://github-redirect.dependabot.com/WoLpH/portalocker/issues/79">#79</a></li>
<li><a href="https://github.com/WoLpH/portalocker/commit/8b6456dbc26a099f9bd705cc7f30ec8e08f6a0d6"><code>8b6456d</code></a> Merge tag 'v2.5.1' into develop</li>
<li>See full diff in <a href="https://github.com/WoLpH/portalocker/compare/v2.5.1...v2.6.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>

4739: Update pytz requirement from ~=2022.4 to ~=2022.5 r=jenshnielsen a=dependabot[bot]

Updates the requirements on [pytz](https://github.com/stub42/pytz) to permit the latest version.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/stub42/pytz/commit/1ab3481a5d5dec72db12f92876cd4d4d63313ccd"><code>1ab3481</code></a> Bump version numbers to 2022.5 / 2022e</li>
<li><a href="https://github.com/stub42/pytz/commit/c5900e59330d02bcd20835fa478a743761a74242"><code>c5900e5</code></a> IANA 2022e</li>
<li><a href="https://github.com/stub42/pytz/commit/872168cbb1ce48bd5fbe4ec9c095f22507340cee"><code>872168c</code></a> Squashed 'tz/' changes from 0fc8f915a..16bd7a384</li>
<li>See full diff in <a href="https://github.com/stub42/pytz/compare/release_2022.4...release_2022.5">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>
  • Loading branch information
bors[bot] and dependabot[bot] authored Oct 19, 2022
4 parents dc2caf6 + 3456d57 + 9102e01 + 8449cf6 commit 63bd2c8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ parso~=0.8.3
pickleshare~=0.7.5
Pillow~=9.2.0
pluggy~=1.0.0
portalocker~=2.5.1
portalocker~=2.6.0
prometheus-client~=0.15.0
prompt-toolkit~=3.0.31
protobuf~=4.21.7
protobuf~=4.21.8
psutil~=5.9.2
pure-eval~=0.2.2
py~=1.11.0
Expand All @@ -112,7 +112,7 @@ pytest-mock~=3.10.0
pytest-rerunfailures~=10.2
pytest-xdist~=2.5.0
python-dateutil~=2.8.2
pytz~=2022.4
pytz~=2022.5
PyVISA~=1.12.0
PyVISA-sim~=0.5.1
pywin32==304; sys_platform == 'win32'
Expand Down

0 comments on commit 63bd2c8

Please sign in to comment.