No longer support checking Python 2 #13135

hauntsaninja · 2022-07-15T22:28:00Z

JelleZijlstra · 2022-07-19T04:01:15Z

mypy/test/helpers.py

@@ -287,6 +287,7 @@ def num_skipped_suffix_lines(a1: List[str], a2: List[str]) -> int:

 def testfile_pyversion(path: str) -> Tuple[int, int]:
    if path.endswith('python2.test'):
+        raise ValueError(path)


Maybe just remove this case?

JelleZijlstra · 2022-07-19T04:01:20Z

mypy/test/helpers.py

@@ -296,6 +297,7 @@ def testfile_pyversion(path: str) -> Tuple[int, int]:

 def testcase_pyversion(path: str, testcase_name: str) -> Tuple[int, int]:
    if testcase_name.endswith('python2'):
+        raise ValueError(testcase_name)


JelleZijlstra · 2022-07-19T04:01:31Z

mypy/test/testdeps.py

@@ -30,6 +30,7 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
        dump_all = '# __dump_all__' in src
        options = parse_options(src, testcase, incremental_step=1)
        if testcase.name.endswith('python2'):
+            raise ValueError(testcase.name)


JelleZijlstra · 2022-07-19T04:01:40Z

mypy/test/testparse.py

@@ -32,6 +32,7 @@ def test_parser(testcase: DataDrivenTestCase) -> None:
    options = Options()

    if testcase.file.endswith('python2.test'):
+        raise ValueError(testcase.name)


JelleZijlstra · 2022-07-19T04:02:00Z

mypy/test/testpythoneval.py

@@ -61,13 +57,7 @@ def test_python_evaluation(testcase: DataDrivenTestCase, cache_dir: str) -> None
    ]
    py2 = testcase.name.lower().endswith('python2')


hauntsaninja

I left those in semi-intentionally, since it proves this removes all tests, before it removes the test scaffolding. But I can remove them

sobolevn

There are still lots of python2 specific logic pieces in checker.py and checkmember.py (probably somewhere else), but this is a great start!

mypy/main.py

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

JukkaL

Love to see so many negative lines!

Looks good, but I found a few test cases that might still be relevant after Python 2 support has been dropped. Can you double check them? Feel free to merge afterwards.

JukkaL · 2022-07-20T11:05:48Z

test-data/unit/cmdline.test

@@ -130,30 +130,6 @@ two/mod/__init__.py: note: See https://mypy.readthedocs.io/en/stable/running_myp
 two/mod/__init__.py: note: Common resolutions include: a) using `--exclude` to avoid checking one of them, b) adding `__init__.py` somewhere, c) using `--explicit-package-bases` or adjusting MYPYPATH
 == Return code: 2

-[case testFlagsFile]
-# cmd: mypy @flagsfile


There doesn't seem to be any other test case that uses @flagsfile, so this test case should not be deleted. We should just change it to use some other flags.

JukkaL · 2022-07-20T11:06:43Z

test-data/unit/cmdline.test

-    except ZeroDivisionError, err:
-        print err
-
-[case testConfigFile]


Similar to above, this doesn't look Python 2 specific as such, but tests using mypy.ini. Please update the test case to use some other config file option.

JukkaL · 2022-07-20T11:07:13Z

test-data/unit/cmdline.test

@@ -166,18 +142,6 @@ def f() -> None:
 main.py: note: In function "f":
 main.py:2: error: Unsupported operand types for + ("int" and "str")

-[case testAltConfigFile]


Similar to above -- keep this test case but use some other config file option.

JukkaL · 2022-07-20T11:09:04Z

test-data/unit/fine-grained-modules.test

@@ -2158,23 +2158,6 @@ main.py:1: note: See https://mypy.readthedocs.io/en/stable/running_mypy.html#mis
 main.py:2: error: Incompatible types in assignment (expression has type "int", variable has type "str")
 ==

-[case testMissingStubAdded2]
-# flags: --follow-imports=skip --py2


This test case might still be relevant. I think that it's better to just drop the --py2 flag but keep the test case.

hauntsaninja · 2022-07-20T19:09:27Z

Thanks, brought back the test cases you mentioned. I was running into some weird issues with testFlagsFile that I couldn't quite figure out — mypy's behaviour outside of the test suite is correct, so I skipped it for now. If I'm not able to figure it out soon, I'll file an issue and fix asynchronously.

github-actions · 2022-07-20T19:37:53Z

According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉

ilevkivskyi · 2022-07-26T19:52:49Z

I think we should go ahead with this and fix testFlagsFile later separately. @hauntsaninja please don't forget to make a follow-up PR.

No longer support checking Python 2

81dd817

Linking python#12237

This comment has been minimized.

Sign in to view

Merge remote-tracking branch 'upstream/master' into py2-2022

22eadc9

This comment has been minimized.

Sign in to view

remove some tests

caa8a59

This comment has been minimized.

Sign in to view

hauntsaninja added 8 commits July 18, 2022 00:32

delete more tests

fece789

delete more

81930ac

clean up some test logic

e17b659

another file

d158e75

and another

98ab83e

accidental typo

ef801bd

fix some more typos

b0bad22

flake8

e7a4a08

This comment has been minimized.

Sign in to view

more test changes

c27d863

This comment has been minimized.

Sign in to view

remove tests

2e4a21c

This comment has been minimized.

Sign in to view

hauntsaninja added 2 commits July 18, 2022 10:06

delete more

0c5830e

delete more

4b4dca2

This comment has been minimized.

Sign in to view

hauntsaninja added 2 commits July 18, 2022 10:46

delete more tests

904ea86

mypy 0.971, test

122bc13

This comment has been minimized.

Sign in to view

add return code

4dbcc58

This comment has been minimized.

Sign in to view

hauntsaninja marked this pull request as ready for review July 19, 2022 03:14

hauntsaninja requested a review from JelleZijlstra July 19, 2022 03:59

JelleZijlstra reviewed Jul 19, 2022

View reviewed changes

hauntsaninja commented Jul 19, 2022

View reviewed changes

hauntsaninja added 2 commits July 18, 2022 22:57

remove scaffolding

181b2c4

remove unused import

11252c5

This comment has been minimized.

Sign in to view

sobolevn reviewed Jul 19, 2022

View reviewed changes

mypy/main.py Outdated Show resolved Hide resolved

Update mypy/main.py

34e1d4c

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

This comment has been minimized.

Sign in to view

fix test

fd83db6

This comment has been minimized.

Sign in to view

JukkaL reviewed Jul 20, 2022

View reviewed changes

hauntsaninja added 3 commits July 20, 2022 11:25

partial revert

f2dbf54

new config file tests

b4faa66

add back missing stub test case

ace465c

ilevkivskyi merged commit 5718dff into python:master Jul 26, 2022

hauntsaninja mentioned this pull request Jul 26, 2022

Fix testFlagsFile #13241

Closed

hauntsaninja deleted the py2-2022 branch July 26, 2022 21:14

sobolevn mentioned this pull request Jul 26, 2022

Remove python2 specific logic for raise keyword check #13242

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

No longer support checking Python 2 #13135

No longer support checking Python 2 #13135

hauntsaninja commented Jul 15, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

JelleZijlstra Jul 19, 2022

JelleZijlstra Jul 19, 2022

JelleZijlstra Jul 19, 2022

JelleZijlstra Jul 19, 2022

JelleZijlstra Jul 19, 2022

hauntsaninja left a comment

This comment has been minimized.

This comment has been minimized.

sobolevn left a comment •

edited

Loading

This comment has been minimized.

This comment has been minimized.

JukkaL left a comment

JukkaL Jul 20, 2022

JukkaL Jul 20, 2022

JukkaL Jul 20, 2022

JukkaL Jul 20, 2022

hauntsaninja commented Jul 20, 2022

github-actions bot commented Jul 20, 2022

ilevkivskyi commented Jul 26, 2022

		@@ -61,13 +57,7 @@ def test_python_evaluation(testcase: DataDrivenTestCase, cache_dir: str) -> None
		]
		py2 = testcase.name.lower().endswith('python2')

No longer support checking Python 2 #13135

No longer support checking Python 2 #13135

Conversation

hauntsaninja commented Jul 15, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hauntsaninja left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

sobolevn left a comment • edited Loading

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

JukkaL left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hauntsaninja commented Jul 20, 2022

github-actions bot commented Jul 20, 2022

ilevkivskyi commented Jul 26, 2022

sobolevn left a comment •

edited

Loading