Update sources for mypy-1.11.1 #6707

pavoljuhas · 2024-08-21T00:53:19Z

typecheck - purge unused ignore comments
typecheck - address complaints about _ComplexLike expressions
typecheck - fix errors on missing return statement
typecheck - tell mypy it has a callable in inner function
typecheck - fix redundant cast to "str"
typecheck - fix type annotation to kwargs to dataclasses.replace
typecheck - fix signature of the replacement function
typecheck - tell mypy about type when extracted from a zip tuple
typecheck - fix incompatible types in assignment
typecheck - fix type complaint due to unnecessary use of functools.partial
Pick up easy lint from the cirq_google/cloud file
Excise unused stub dependencies in mypy.txt

Fixes #6705

Use iterator to annotate generator functions.

The argument names in the replacement callable must match the original.

Address complaints on tuple-vs-ndarray and int vs np.int64.

…rtial

Fix (wrong-import-position) and (unused-import) with a temporarily enabled pylint check.

Needed in modules importing pkg_resources.

codecov · 2024-08-21T01:15:32Z

Codecov Report

Attention: Patch coverage is 98.96907% with 1 line in your changes missing coverage. Please review.

Project coverage is 97.83%. Comparing base (2f922cd) to head (963b558).
Report is 2 commits behind head on main.

Files	Patch %	Lines
cirq-core/cirq/vis/heatmap.py	75.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6707      +/-   ##
==========================================
- Coverage   97.83%   97.83%   -0.01%     
==========================================
  Files        1077     1077              
  Lines       92502    92482      -20     
==========================================
- Hits        90501    90480      -21     
- Misses       2001     2002       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

dstrain115 · 2024-08-22T23:12:12Z

cirq-core/cirq/value/linear_dict.py

@@ -34,7 +34,7 @@
 )
 from typing_extensions import Self

-Scalar = Union[complex, float, numbers.Complex]
+Scalar = complex


Does this still cover floats and numpy complex numbers?

Good catch. int and float are OK for complex annotation per PEP-0484, but numpy types did not match. Turns out they also did not match in the main branch (2f922cd) with mypy-1.2.0, but it looks all is good after 00765f0 here.

Here is a test to check if numeric types pass -

# linear_dict_typing.py -- check with # mypy --config-file=dev_tools/conf/mypy.ini linear_dict_typing.py import numpy as np import cirq cirq.LinearDict({'a': 1}) cirq.LinearDict({'a': np.int32(32)}) cirq.LinearDict({'a': np.int64(64)}) cirq.LinearDict({'a': 2.0}) cirq.LinearDict({'a': np.float32(32.0)}) cirq.LinearDict({'a': np.float64(64.0)}) cirq.LinearDict({'a': complex(3j)}) cirq.LinearDict({'a': np.complex64(3j)}) cirq.LinearDict({'a': np.complex128(3j)})

maffoo · 2024-08-22T23:35:08Z

cirq-core/cirq/interop/quirk/cells/parse.py

@@ -191,7 +191,9 @@ def feed_op(could_be_binary: bool, token: Any) -> None:
            elif token.unary_action is not None:


consider using a walrus operator here:

Suggested change

elif token.unary_action is not None:

elif (action := token.unary_action) is not None:

Then lambda _, b: action(b) should work.

Ack. I feel the current version makes it a bit more clear why is the attribute stored in a local var.

maffoo · 2024-08-22T23:38:13Z

cirq-core/cirq/ops/projector.py

@@ -61,7 +61,7 @@ def matrix(self, projector_qids: Optional[Iterable[raw_types.Qid]] = None) -> cs
            for qid in projector_qids
        ]

-        total_d = np.prod([qid.dimension for qid in projector_qids], dtype=np.int64)
+        total_d = np.prod([qid.dimension for qid in projector_qids], dtype=np.int64).item()


consider using math.prod instead

Suggested change

total_d = np.prod([qid.dimension for qid in projector_qids], dtype=np.int64).item()

total_d = math.prod(qid.dimension for qid in projector_qids)

Nice! Done in b32f04e

maffoo · 2024-08-22T23:39:41Z

cirq-core/cirq/sim/state_vector_test.py

@@ -175,7 +175,7 @@ def test_sample_no_indices_repetitions():

 @pytest.mark.parametrize('use_np_transpose', [False, True])
 def test_measure_state_computational_basis(use_np_transpose: bool):
-    linalg.can_numpy_support_shape = lambda s: use_np_transpose
+    linalg.can_numpy_support_shape = lambda shape: use_np_transpose


nit: use _shape instead since the arg is unused?

Suggested change

linalg.can_numpy_support_shape = lambda shape: use_np_transpose

linalg.can_numpy_support_shape = lambda _shape: use_np_transpose

Same thing for several other places below.

The actual mypy complaint was about the replacement function not matching the previous signature as the can_numpy_support_shape has shape argument. Looking at it again, this test overwrites cirq.linalg. can_numpy_support_shape without restoring it back.

This is fixed in f7da161.

maffoo · 2024-08-22T23:41:05Z

cirq-core/cirq/vis/heatmap.py

@@ -36,6 +38,9 @@
 from cirq.devices import grid_qubit
 from cirq.vis import vis_utils

+if TYPE_CHECKING:
+    from numpy.typing import ArrayLike


Can't do this in an if TYPE_CHECKING block unless you also make annotations lazy by doing from __future__ import annotations.

Done, thank you.

maffoo · 2024-08-22T23:43:58Z

dev_tools/requirements/deps/mypy.txt


 # packages with stub types for various libraries
-types-backports==0.1.3
-types-cachetools


Are the cachetools types no longer needed?

Indeed. cachetools are not imported after #6596.

cirq-ionq/cirq_ionq/ionq_gateset.py

Co-authored-by: Matthew Neeley <[email protected]>

- typecheck - purge unused ignore comments - typecheck - address complaints about _ComplexLike expressions - typecheck - fix errors on missing return statement - typecheck - tell mypy it has a callable in inner function - typecheck - fix redundant cast to "str" - typecheck - fix type annotation to kwargs to dataclasses.replace - typecheck - fix signature of the replacement function and restore the original function after the test - typecheck - tell mypy about type when extracted from a zip tuple - typecheck - fix incompatible types in assignment - typecheck - fix type complaint due to unnecessary use of functools.partial - Pick up easy lint from the cirq_google/cloud file - Excise unused stub dependencies in mypy.txt Fixes quantumlib#6705

pavoljuhas added 14 commits August 20, 2024 17:44

Update to mypy-1.11.1

e4a8e30

typecheck - purge unused ignore comments

12cb396

typecheck - address complaints about _ComplexLike expressions

fb1e238

typecheck - fix errors on missing return statement

b0480b8

Use iterator to annotate generator functions.

typecheck - tell mypy it has a callable in inner function

64e6708

typecheck - fix redundant cast to "str"

d7ae150

typecheck - fix type annotation to kwargs to dataclasses.replace

e49d616

typecheck - fix signature of the replacement function

d316684

The argument names in the replacement callable must match the original.

typecheck - tell mypy about type when extracted from a zip tuple

eb9ba15

typecheck - fix incompatible types in assignment

88e0426

Address complaints on tuple-vs-ndarray and int vs np.int64.

typecheck - fix type complaint due to unnecessary use of functools.pa…

4ff105b

…rtial

Pick up easy lint from the cirq_google/cloud file

6c41e25

Fix (wrong-import-position) and (unused-import) with a temporarily enabled pylint check.

Excise unused stub dependencies

63f558f

Put back type stubs for setuptools

787a6c2

Needed in modules importing pkg_resources.

pavoljuhas marked this pull request as ready for review August 21, 2024 01:19

pavoljuhas requested review from mrwojtek, vtomole, a team, dabacon, ColemanCollins, nakardo, gmauricio, wcourtney and verult as code owners August 21, 2024 01:19

dstrain115 approved these changes Aug 22, 2024

View reviewed changes

maffoo reviewed Aug 22, 2024

View reviewed changes

pavoljuhas added 3 commits August 22, 2024 18:13

typecheck - support numpy scalar types in LinearDict

00765f0

Future bright future will you satisfy mypy?

c4966f9

Use math.prod for painless typecheck

b32f04e

pavoljuhas and others added 3 commits August 23, 2024 00:25

Ensure test does not change API function

f7da161

Combine imports in cirq-ionq/cirq_ionq/ionq_gateset.py

b8893ca

Co-authored-by: Matthew Neeley <[email protected]>

Merge branch 'main' into sync-with-mypy-1.11.1

963b558

pavoljuhas requested a review from maffoo August 23, 2024 17:06

maffoo approved these changes Aug 23, 2024

View reviewed changes

pavoljuhas merged commit 6037f18 into quantumlib:main Aug 23, 2024
34 checks passed

pavoljuhas deleted the sync-with-mypy-1.11.1 branch August 23, 2024 20:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update sources for mypy-1.11.1 #6707

Update sources for mypy-1.11.1 #6707

Uh oh!

pavoljuhas commented Aug 21, 2024

Uh oh!

codecov bot commented Aug 21, 2024 •

edited

Loading

Uh oh!

dstrain115 Aug 22, 2024

Uh oh!

pavoljuhas Aug 23, 2024

Uh oh!

maffoo Aug 22, 2024

Uh oh!

pavoljuhas Aug 23, 2024

Uh oh!

maffoo Aug 22, 2024

Uh oh!

pavoljuhas Aug 23, 2024

Uh oh!

maffoo Aug 22, 2024

Uh oh!

pavoljuhas Aug 23, 2024

Uh oh!

maffoo Aug 22, 2024

Uh oh!

pavoljuhas Aug 23, 2024

Uh oh!

maffoo Aug 22, 2024

Uh oh!

pavoljuhas Aug 23, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

		@@ -191,7 +191,9 @@ def feed_op(could_be_binary: bool, token: Any) -> None:
		elif token.unary_action is not None:

	elif token.unary_action is not None:
	elif (action := token.unary_action) is not None:

	total_d = np.prod([qid.dimension for qid in projector_qids], dtype=np.int64).item()
	total_d = math.prod(qid.dimension for qid in projector_qids)

	linalg.can_numpy_support_shape = lambda shape: use_np_transpose
	linalg.can_numpy_support_shape = lambda _shape: use_np_transpose

Update sources for mypy-1.11.1 #6707

Update sources for mypy-1.11.1 #6707

Uh oh!

Conversation

pavoljuhas commented Aug 21, 2024

Uh oh!

codecov bot commented Aug 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Aug 21, 2024 •

edited

Loading