Skip to content

Commit

Permalink
Merge #4791 #4792
Browse files Browse the repository at this point in the history
4791: Bump mypy from 0.982 to 0.990 r=jenshnielsen a=dependabot[bot]

Bumps [mypy](https://github.com/python/mypy) from 0.982 to 0.990.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/python/mypy/commit/b71dc3da0d8c6a4e116eef98a7ff8591145338be"><code>b71dc3d</code></a> Remove +dev from version</li>
<li><a href="https://github.com/python/mypy/commit/719cef94273ba7ed09a959ee3ea6915ec13faf08"><code>719cef9</code></a> Add support for exception groups and except* (<a href="https://github-redirect.dependabot.com/python/mypy/issues/14020">#14020</a>)</li>
<li><a href="https://github.com/python/mypy/commit/91b6fc32322d89c0c171090ad1c6beac467832ed"><code>91b6fc3</code></a> Fix crash on nested unions in recursive types (<a href="https://github-redirect.dependabot.com/python/mypy/issues/14007">#14007</a>)</li>
<li><a href="https://github.com/python/mypy/commit/42a4c69789d855e2a07a5826b4e40331bc407e95"><code>42a4c69</code></a> Make TryStar not crash (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13991">#13991</a>)</li>
<li><a href="https://github.com/python/mypy/commit/5fad1ac4a7b8b5048a8a10934dba9664d410c6e2"><code>5fad1ac</code></a> Warn on invalid <code>*args</code> and <code>**kwargs</code> with <code>ParamSpec</code> (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13892">#13892</a>)</li>
<li><a href="https://github.com/python/mypy/commit/184add99f4ebe35c3e0a5b83fad38b93da443d8c"><code>184add9</code></a> Revert sum literal integer change (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13961">#13961</a>)</li>
<li><a href="https://github.com/python/mypy/commit/74e0dff0b0ee3636ad43000f1ee785eaef6d2d8f"><code>74e0dff</code></a> Add hidden options to disable bytes promotion (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13952">#13952</a>)</li>
<li><a href="https://github.com/python/mypy/commit/ec6d9d974b5ae7b985fd5c1585d54eb0f86752f5"><code>ec6d9d9</code></a> [mypyc] Fix ircheck if register is initialized through LoadAddress (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13944">#13944</a>)</li>
<li><a href="https://github.com/python/mypy/commit/8ef701d03baeb2d714bd40f94d0037699c9face2"><code>8ef701d</code></a> Use <code>3.11</code> instead of <code>3.11-dev</code> (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13945">#13945</a>)</li>
<li><a href="https://github.com/python/mypy/commit/ec149da93d7a5557d0bb2f2955f5d88a684148a1"><code>ec149da</code></a> [mypyc] Fix glue methods with native int types (<a href="https://github-redirect.dependabot.com/python/mypy/issues/13939">#13939</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/python/mypy/compare/v0.982...v0.990">compare view</a></li>
</ul>
</details>
<br />


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

4792: Bump pywin32 from 304 to 305 r=jenshnielsen a=dependabot[bot]

Bumps [pywin32](https://github.com/mhammond/pywin32) from 304 to 305.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/mhammond/pywin32/releases">pywin32's releases</a>.</em></p>
<blockquote>
<h2>Release 305</h2>
<p><a href="https://github.com/mhammond/pywin32/blob/52628af307f9ce29864bbfd62eb3a02c74fa3272/CHANGES.txt#L17">The changes</a></p>
<p>You should use pip:</p>
<blockquote>
<p>pip install pywin32 --upgrade</p>
</blockquote>
<p>More <a href="https://github.com/mhammond/pywin32#installing-via-pip">details in the README</a></p>
<p><strong><a href="https://github.com/mhammond/pywin32#binaries">.exe installers are now deprecated</a></strong>, but while they still exist, you must choose both the correct Python version and &quot;bittedness&quot;. Even if you have a 64bit computer, if you installed a 32bit version of Python you must install the 32bit version of pywin32.</p>
<p>There is one binary per-version, per-bittedness. To determine what version of Python you have, start Python and look at the first line of the banner. Compare these 2:</p>
<pre><code>Python 2.7.2+ ... [MSC v.1500 32 bit (Intel)] on win32
Python 2.7.2+ ... [MSC v.1500 64 bit (AMD64)] on win32
                              ^^^^^^^^^^^^^^
</code></pre>
<p>If the installation process informs you that Python is not found in the registry, it almost certainly means you have downloaded the wrong version - either for the wrong version of Python, or the wrong &quot;bittedness&quot;.</p>
<p>But as above: <strong>.exe installers are deprecated</strong> - please <a href="https://github.com/mhammond/pywin32#installing-via-pip">use pip</a>.</p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/mhammond/pywin32/blob/main/CHANGES.txt">pywin32's changelog</a>.</em></p>
<blockquote>
<h2>Build 305, released 2022-11-06</h2>
<ul>
<li>
<p>Installation .exe files were deprecated.</p>
</li>
<li>
<p><a href="https://github.com/kxrob"><code>`@​kxrob</code></a>` put a lot of work towards removing use of the deprecated Unicode
API so we can build on Python 3.12. This should be largely invisible, but
please report any unintended consequences.</p>
</li>
<li>
<p>odbc: Handle <code>varchar(max)</code>/<code>nvarchar(max)</code> column sizes (<a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1954">#1954</a>)</p>
</li>
<li>
<p>win32api.GetTickCount() now returns an unsigned 64bit integer (<a href="https://github.com/kxrob"><code>`@​kxrob</code></a>,` <a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1946">#1946</a>)</p>
</li>
<li>
<p>win32pipe.GetNamedPipeHandleState() now takes a 3rd optional param
indicating whether the username should be returned, and related constants
added. (<a href="https://github.com/kxrob"><code>`@​kxrob</code></a>,` <a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1946">#1946</a>)</p>
</li>
<li>
<p>Added win32gui.GetTopWindow() and win32gui.GetAncestor() (<a href="https://github.com/CristiFati"><code>`@​CristiFati</code></a>,` <a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1928">#1928</a>)</p>
</li>
<li>
<p>Tweaks to how pywintypes searches for DLLs to better support virtualenvs
created with --system-site-packages. (<a href="https://github.com/saaketp"><code>`@​saaketp</code></a>,` <a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1933">#1933</a>)</p>
</li>
<li>
<p>Added win32event.CreateWaitableTimerExW (<a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1945">#1945</a>, <a href="https://github.com/zariiii9003"><code>`@​zariiii9003</code></a>)</p>`
</li>
<li>
<p>Changes in PARAM handling. Some functions which returned a WPARAM or LPARAM
allowed you to return a pointer to a Python buffer object or a PyUnicode.
These functions now only accept a Python long to be returned. Note that
this DOES NOT apply to functions with accept WPARAM or LPARAM as arguments,
only when they are being returned. Impacted functions are <code>OnNotify</code>
handler, LV_ITEM/TV_ITEM objects, PyIContextMenu3::HandleMenuMsg2, and the
result of a WNDPROC/DLGPROC (<a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1927">#1927</a>).</p>
</li>
<li>
<p>service registration had an overhaul, avoiding a complicated, and ultimately
unnecessary &quot;single globally registered service runner&quot; concept.
Now, when registering a service, the host pythonservice.exe runner will be
copied to <code>sys.exec_prefix</code>, along with possibly <code>pywintypesXX.dll</code> and run
from there. (<a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1908">#1908</a>)</p>
</li>
<li>
<p>Dropped support for allowing a bytes object to be passed where a COM BSTR
is expected - this support was accidental on the path from 2.x-&gt;3.x.</p>
</li>
<li>
<p>win32crypt's PyCERTSTORE.CertCloseStore()'s <code>Flags</code> argument has been
deprecated as it is likely to crash the process if
<code>CERT_CLOSE_STORE_FORCE_FLAG</code> is specified. The underlying function is now
always called with <code>CERT_CLOSE_STORE_CHECK_FLAG</code>, and support for this
param will be dropped at some point in the future.</p>
</li>
<li>
<p>Fix a bug where win32crypt.CryptQueryObject() would return a PyCTL_CONTEXT
object instead of a PyCERT_CONTEXT for base64 encoded certificates (<a href="https://github-redirect.dependabot.com/mhammond/pywin32/issues/1859">#1859</a>)</p>
</li>
<li>
<p>win32crypt.CryptQueryObject() is now able to return PyCTL_CONTEXT objects.</p>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/mhammond/pywin32/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pywin32&package-manager=pip&previous-version=304&new-version=305)](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 <[email protected]>
  • Loading branch information
3 people authored Nov 8, 2022
3 parents 4ce76c1 + 01cd41f + 43b08e5 commit d8f83ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion qcodes/instrument_drivers/Keysight/Infiniium.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
)
from qcodes.parameters import (
Parameter,
ParameterBase,
ParameterWithSetpoints,
create_on_off_val_mapping,
)
Expand Down Expand Up @@ -105,7 +106,7 @@ def __init__(
self._unit = 0

@property
def setpoints(self) -> Sequence[Parameter]:
def setpoints(self) -> Sequence[ParameterBase]:
"""
Overwrite setpoint parameter to update setpoints if auto_digitize is true
"""
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ matplotlib-inline~=0.1.6
mistune~=2.0.4
msal~=1.20.0
msal-extensions~=1.0.0
mypy==0.982
mypy==0.990
mypy-extensions~=0.4.3
nbclient~=0.7.0
nbconvert~=7.2.2
Expand Down Expand Up @@ -115,7 +115,7 @@ python-dateutil~=2.8.2
pytz~=2022.5
PyVISA~=1.12.0
PyVISA-sim~=0.5.1
pywin32==304; sys_platform == 'win32'
pywin32==305; sys_platform == 'win32'
pywinpty~=2.0.8; sys_platform == 'win32'
PyYAML~=6.0
pyzmq~=24.0.1
Expand Down

0 comments on commit d8f83ab

Please sign in to comment.