TYP: Make mypy 0.800 compatible #39407

phofl · 2021-01-25T23:28:47Z

closes TYP upgrade and pin mypy to 0.800 #39399
Ensure all linting tests pass, see here for how to run them

jbrockmendel · 2021-01-25T23:56:48Z

jreback · 2021-01-26T02:30:22Z

environment.yml

@@ -23,7 +23,7 @@ dependencies:
  - flake8
  - flake8-comprehensions>=3.1.0  # used by flake8, linting of unnecessary comprehensions
  - isort>=5.2.1  # check that imports are in the right order
-  - mypy=0.790
+  - mypy


i think ok to pin >=

we have been pinning to exact version up to now.

we pin to avoid ci surprises. also since we use warn_unused_ignores = True, mypy will only be green with the specified version.

Thx, pinned again

jreback · 2021-01-26T02:31:07Z

pandas/plotting/_matplotlib/boxplot.py

@@ -28,7 +28,7 @@ class BoxPlot(LinePlot):

    _valid_return_types = (None, "axes", "dict", "both")
    # namedtuple to hold results
-    BP = namedtuple("Boxplot", ["ax", "lines"])
+    BP = namedtuple("BP", ["ax", "lines"])


OT we could use data classes here

simonjayhawkins

Thanks @phofl generally lgtm

simonjayhawkins · 2021-01-26T10:39:33Z

environment.yml

@@ -23,7 +23,7 @@ dependencies:
  - flake8
  - flake8-comprehensions>=3.1.0  # used by flake8, linting of unnecessary comprehensions
  - isort>=5.2.1  # check that imports are in the right order
-  - mypy=0.790
+  - mypy


we have been pinning to exact version up to now.

we pin to avoid ci surprises. also since we use warn_unused_ignores = True, mypy will only be green with the specified version.

simonjayhawkins · 2021-01-26T10:39:54Z

pandas/io/common.py

@@ -182,7 +182,7 @@ def stringify_path(
        return cast(FileOrBuffer[AnyStr], filepath_or_buffer)

    # Only @runtime_checkable protocols can be used with instance and class checks


can remove this

simonjayhawkins · 2021-01-26T10:40:07Z

pandas/io/stata.py

@@ -2491,9 +2491,9 @@ def write_file(self) -> None:
                self.handles.close()
                # Only @runtime_checkable protocols can be used with instance and class


simonjayhawkins · 2021-01-26T10:54:49Z

pandas/util/_decorators.py

@@ -79,7 +79,7 @@ def wrapper(*args, **kwargs) -> Callable[..., Any]:
        {dedent(doc)}"""
        )

-    return wrapper
+    return wrapper  # type: ignore[return-value]


add the error message as a comment to help future readers and contributors looking to help with #37715

Suggested change

return wrapper # type: ignore[return-value]

# error: Incompatible return value type (got "Callable[[VarArg(Any),

# KwArg(Any)], Callable[...,Any]]", expected "Callable[[F], F]")

return wrapper # type: ignore[return-value]

simonjayhawkins · 2021-01-26T11:07:33Z

pandas/tests/io/parser/common/test_file_buffer_url.py

@@ -330,8 +331,9 @@ def test_read_csv_file_handle(all_parsers, io_class, encoding):
    parser = all_parsers
    expected = DataFrame({"a": [1], "b": [2]})

-    content = "a,b\n1,2"
+    content: Union[str, bytes] = "a,b\n1,2"


Suggested change

content: Union[str, bytes] = "a,b\n1,2"

content: str | bytes = "a,b\n1,2"

😁

we have

[mypy-pandas.tests.*] check_untyped_defs=False

so not sure why mypy is checking this function anyway.

OTOH could refactor...

content = "a,b\n1,2" handle = io_class(content.encode("utf-8") if io_class == BytesIO else content)

Hm the refactor is better. Thx.

simonjayhawkins

Thanks @phofl lgtm pending green

phofl · 2021-01-26T20:17:43Z

@simonjayhawkins green.

Could you point me to an example of something like str | bytes? Searched for something like this but could not find it

simonjayhawkins · 2021-01-26T20:45:49Z

Could you point me to an example of something like str | bytes? Searched for something like this but could not find it

from http://mypy-lang.blogspot.com/

Two new Python features improve this situation and are now supported by mypy:

PEP 585 lets you use list[int] instead of List[int] (no need to import List and other generic collections from typing).
PEP 604 lets you write X | Y instead of Union[X, Y], and X | None instead of Optional[X] (no need to import Union or Optional from typing).
Note: Using list[int] requires Python 3.9 and X | Y requires Python 3.10 (alpha) in order to work at runtime. To use them on older versions of Python, use from __future__ import annotations. This allows them to be used in type annotations, but the older variants (or string literal escaping) may be required in non-annotation contexts, such as in type aliases. See the docs for more details.

phofl · 2021-01-26T20:47:15Z

thanks very much, should have looked there and not in our codebase :)

simonjayhawkins · 2021-01-26T20:57:40Z

@phofl also need to update the version in the doc/source/whatsnew/v1.3.0.rst

phofl · 2021-01-26T21:02:15Z

Thx, did not think about this. #39419

TYP: Make mypy 0.800 compatible

14be337

phofl added the Typing type annotations, mypy/pyright type checking label Jan 25, 2021

jreback reviewed Jan 26, 2021

View reviewed changes

simonjayhawkins added this to the 1.3 milestone Jan 26, 2021

simonjayhawkins reviewed Jan 26, 2021

View reviewed changes

Adress review

beb14e7

simonjayhawkins approved these changes Jan 26, 2021

View reviewed changes

simonjayhawkins merged commit 2c4c9f3 into pandas-dev:master Jan 26, 2021

phofl deleted the typ_mypy_0800 branch January 26, 2021 20:47

phofl mentioned this pull request Jan 26, 2021

DOC: Update mypy version in whatsnew #39419

Merged

1 task

		@@ -182,7 +182,7 @@ def stringify_path(
		return cast(FileOrBuffer[AnyStr], filepath_or_buffer)

		# Only @runtime_checkable protocols can be used with instance and class checks

		@@ -2491,9 +2491,9 @@ def write_file(self) -> None:
		self.handles.close()
		# Only @runtime_checkable protocols can be used with instance and class

	content: Union[str, bytes] = "a,b\n1,2"
	content: str \| bytes = "a,b\n1,2"

Uh oh!

TYP: Make mypy 0.800 compatible #39407

TYP: Make mypy 0.800 compatible #39407

Uh oh!

Conversation

phofl commented Jan 25, 2021

Uh oh!

jbrockmendel commented Jan 25, 2021

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!

simonjayhawkins left a comment

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!

simonjayhawkins left a comment

Choose a reason for hiding this comment

Uh oh!

phofl commented Jan 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

simonjayhawkins commented Jan 26, 2021

Uh oh!

phofl commented Jan 26, 2021

Uh oh!

simonjayhawkins commented Jan 26, 2021

Uh oh!

phofl commented Jan 26, 2021

Uh oh!

Uh oh!

phofl commented Jan 26, 2021 •

edited

Loading