Updates round 3 by matthewhughes934 · Pull Request #2334 · PyCQA/isort

matthewhughes934 · 2025-01-14T22:21:34Z

Final round of updates from my fork. After this I think all dependencies
should be close to their latest release, in my fork I added dependabot
after these changes to keep things up to date.

Context, other PRs were from 26cf27d,
78c30dc and comment
#2320 (comment)

Update mypy to v1+

This includes removing some now unused ignores, and fixing some new
errors:

  isort/sorting.py:120: error: Unused "type: ignore" comment  [unused-ignore]
  isort/settings.py:869: error: Unused "type: ignore" comment  [unused-ignore]
  isort/literal.py:89: error: Unused "type: ignore" comment  [unused-ignore]
  isort/deprecated/finders.py:32: error: Incompatible types in assignment (expression has type "None", variable has type "Callable[[PathLike[Any], Optional[Any], bool, bool], Dict[str, Union[Requirement, UnparsedRequirement]]]")  [assignment]
  isort/api.py:196: error: No overload variant of "compile" matches argument types "str", "str", "str", "int", "int"  [call-overload]
  isort/api.py:196: note: Possible overload variants:
  isort/api.py:196: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[0], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> CodeType
  isort/api.py:196: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, *, dont_inherit: bool = ..., optimize: int = ..., _feature_version: int = ...) -> CodeType
  isort/api.py:196: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[1024], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> AST
  isort/api.py:196: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: int, dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> Any
  isort/api.py:223: error: No overload variant of "compile" matches argument types "str", "str", "str", "int", "int"  [call-overload]
  isort/api.py:223: note: Possible overload variants:
  isort/api.py:223: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[0], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> CodeType
  isort/api.py:223: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, *, dont_inherit: bool = ..., optimize: int = ..., _feature_version: int = ...) -> CodeType
  isort/api.py:223: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[1024], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> AST
  isort/api.py:223: note:     def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: int, dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> Any
  tests/integration/test_setting_combinations.py:64: error: Unused "type: ignore" comment  [unused-ignore]
  tests/unit/test_isort.py:5550: error: Signature of "seek" incompatible with supertype "TextIOWrapper"  [override]
  tests/unit/test_isort.py:5550: note:      Superclass:
  tests/unit/test_isort.py:5550: note:          def seek(self, int, int = ..., /) -> int
  tests/unit/test_isort.py:5550: note:      Subclass:
  tests/unit/test_isort.py:5550: note:          def seek(self, position: Any) -> Any
  tests/unit/test_isort.py:5550: error: Signature of "seek" incompatible with supertype "IOBase"  [override]
  tests/unit/test_isort.py:5550: note:      Superclass:
  tests/unit/test_isort.py:5550: note:          def seek(self, int, int = ..., /) -> int
  tests/unit/test_isort.py:5550: note:      Subclass:
  tests/unit/test_isort.py:5550: note:          def seek(self, position: Any) -> Any
  tests/unit/test_isort.py:5550: error: Signature of "seek" incompatible with supertype "IO"  [override]
  tests/unit/test_isort.py:5550: note:      Superclass:
  tests/unit/test_isort.py:5550: note:          def seek(self, int, int = ..., /) -> int
  tests/unit/test_isort.py:5550: note:      Subclass:
  tests/unit/test_isort.py:5550: note:          def seek(self, position: Any) -> Any
  tests/integration/test_hypothesmith.py:69: error: Unused "type: ignore" comment  [unused-ignore]
  Found 11 errors in 8 files (checked 88 source files)

Update bugbear

And fix some issues from new bugbear:

  tests/unit/test_setuptools_command.py:15:5: B036 Don't except `BaseException` unless you plan to re-raise it.
  tests/unit/test_setuptools_command.py:30:5: B036 Don't except `BaseException` unless you plan to re-raise it.

matthewhughes934 · 2025-01-14T22:23:43Z

@staticdev since I saw you merge my previous PR, I raised this just in case you wanted some more dependency updates since it was just a matter of cherry-picking from my fork

codecov · 2025-01-14T22:23:54Z

Codecov Report

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

Project coverage is 99.12%. Comparing base (c85b575) to head (0eaafa0).
Report is 3 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2334   +/-   ##
=======================================
  Coverage   99.12%   99.12%           
=======================================
  Files          40       40           
  Lines        3098     3098           
  Branches      788      788           
=======================================
  Hits         3071     3071           
  Misses         15       15           
  Partials       12       12

DanielNoord · 2025-01-14T22:52:41Z


 except ImportError:
-    parse_requirements = None
+    parse_requirements = None  # type: ignore[assignment]


This can be fixed by initialising parse_requirements on line 27 as parse_requirements: types.ModelType | None right? Or does mypy no longer support that pattern?

This can be fixed by initialising parse_requirements on line 27 as parse_requirements: types.ModelType | None right? Or does mypy no longer support that pattern?

Sorry, what is types.ModelType?

I think the typing would have to be something like (from a glance at https://github.com/di/pip-api/blob/21eea42e37b29e18c004a922f8989108a006a203/pip_api/_parse_requirements.py#L484):

parse_requirements: ( Callable[ [os.PathLike[str], Optional[Any], bool, bool], Dict[str, Union[pip_api.Requirement, pip_api.UnparsedRequirement]], ] | None )

but that's a bit tricky, because at this point pip_api isn't imported, so pip_api.UnparsedRequirement is unknown

Ah my bad, didn't read this correctly.

Indeed seems like fixing this is more trouble than it is worth

DanielNoord · 2025-01-14T22:53:08Z

 hypothesmith = ">=0.1.3"
 hypothesis = ">=6.10.1"
-mypy = ">=0.902,<1.0.0"
+mypy = ">=0.902,<2.0.0"


Why limit this to below 2?

Why limit this to below 2?

The original commit was from dependabot (matthewhughes934/isort-fork@390f27e) and that's how it handled it, happy to drop the restriction

I would probably remove it, but @staticdev might have a different opinion

staticdev · 2025-01-17T17:09:25Z

 hypothesmith = ">=0.1.3"
 hypothesis = ">=6.10.1"
-mypy = ">=0.902,<1.0.0"
+mypy = ">=0.902,<2.0.0"


I would suggest to change to:

Suggested change

mypy = ">=0.902,<2.0.0"

mypy = ">=1.14.1"

I would suggest to change to:

updated while rebasing on main: 01afb2e

staticdev · 2025-01-17T17:10:16Z

 example-shared-isort-profile = ">=0.1.0"
 flake8 = ">=3.8.4"
-flake8-bugbear = ">=22.12.6,<23.0.0"
+flake8-bugbear = ">=22.12.6,<25.0.0"


Here I would do:

Suggested change

flake8-bugbear = ">=22.12.6,<25.0.0"

flake8-bugbear = ">=24.12.12"

Here I would do:

squashed in with my rebase: a8dbecf

matthewhughes934 · 2025-01-17T20:20:11Z

actions look unhappy, but this is also true for main: checks are failing on 1c8d963. I think #2339 is addressing this

DanielNoord

LGTM!

@staticdev I think we can merge this already, it doesn't break main more than it already is

staticdev

@matthewhughes934 still we have to figure out what is the issue now with Python 3.13, since tests still are not passing.

matthewhughes934 · 2025-01-20T12:13:23Z

@matthewhughes934 still we have to figure out what is the issue now with Python 3.13, since tests still are not passing.

👍 I will have a deeper look later today

matthewhughes934 · 2025-01-20T19:38:45Z

@matthewhughes934 still we have to figure out what is the issue now with Python 3.13, since tests still are not passing.

the failure was a built time, I've fixed it up and rebased, see commit faf22ce for details (the last bit of the body)

staticdev · 2025-01-20T20:27:32Z

Sorry @matthewhughes934 due to a merge of new Poetry this lock got obsolete. Could you please rebase and lock again?

This includes removing some now unused ignores, and fixing some new errors: isort/sorting.py:120: error: Unused "type: ignore" comment [unused-ignore] isort/settings.py:869: error: Unused "type: ignore" comment [unused-ignore] isort/literal.py:89: error: Unused "type: ignore" comment [unused-ignore] isort/deprecated/finders.py:32: error: Incompatible types in assignment (expression has type "None", variable has type "Callable[[PathLike[Any], Optional[Any], bool, bool], Dict[str, Union[Requirement, UnparsedRequirement]]]") [assignment] isort/api.py:196: error: No overload variant of "compile" matches argument types "str", "str", "str", "int", "int" [call-overload] isort/api.py:196: note: Possible overload variants: isort/api.py:196: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[0], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> CodeType isort/api.py:196: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, *, dont_inherit: bool = ..., optimize: int = ..., _feature_version: int = ...) -> CodeType isort/api.py:196: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[1024], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> AST isort/api.py:196: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: int, dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> Any isort/api.py:223: error: No overload variant of "compile" matches argument types "str", "str", "str", "int", "int" [call-overload] isort/api.py:223: note: Possible overload variants: isort/api.py:223: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[0], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> CodeType isort/api.py:223: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, *, dont_inherit: bool = ..., optimize: int = ..., _feature_version: int = ...) -> CodeType isort/api.py:223: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: Literal[1024], dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> AST isort/api.py:223: note: def compile(source: Union[str, Buffer, Module, Expression, Interactive], filename: Union[str, Buffer, _PathLike[Any]], mode: str, flags: int, dont_inherit: bool = ..., optimize: int = ..., *, _feature_version: int = ...) -> Any tests/integration/test_setting_combinations.py:64: error: Unused "type: ignore" comment [unused-ignore] tests/unit/test_isort.py:5550: error: Signature of "seek" incompatible with supertype "TextIOWrapper" [override] tests/unit/test_isort.py:5550: note: Superclass: tests/unit/test_isort.py:5550: note: def seek(self, int, int = ..., /) -> int tests/unit/test_isort.py:5550: note: Subclass: tests/unit/test_isort.py:5550: note: def seek(self, position: Any) -> Any tests/unit/test_isort.py:5550: error: Signature of "seek" incompatible with supertype "IOBase" [override] tests/unit/test_isort.py:5550: note: Superclass: tests/unit/test_isort.py:5550: note: def seek(self, int, int = ..., /) -> int tests/unit/test_isort.py:5550: note: Subclass: tests/unit/test_isort.py:5550: note: def seek(self, position: Any) -> Any tests/unit/test_isort.py:5550: error: Signature of "seek" incompatible with supertype "IO" [override] tests/unit/test_isort.py:5550: note: Superclass: tests/unit/test_isort.py:5550: note: def seek(self, int, int = ..., /) -> int tests/unit/test_isort.py:5550: note: Subclass: tests/unit/test_isort.py:5550: note: def seek(self, position: Any) -> Any tests/integration/test_hypothesmith.py:69: error: Unused "type: ignore" comment [unused-ignore] Found 11 errors in 8 files (checked 88 source files)

And fix some issues from new `bugbear`: tests/unit/test_setuptools_command.py:15:5: B036 Don't except `BaseException` unless you plan to re-raise it. tests/unit/test_setuptools_command.py:30:5: B036 Don't except `BaseException` unless you plan to re-raise it.

matthewhughes934 · 2025-01-20T20:56:46Z

Sorry @matthewhughes934 due to a merge of new Poetry this lock got obsolete. Could you please rebase and lock again?

👍 looks like that change brought in all the updates from my first commit, so that's gone away with the rebase

staticdev · 2025-01-20T21:32:44Z

LGTM, thanks @matthewhughes934 @DanielNoord

matthewhughes934 force-pushed the updates-round3 branch from c2c654a to 677d368 Compare January 14, 2025 22:22

DanielNoord reviewed Jan 14, 2025

View reviewed changes

staticdev requested changes Jan 17, 2025

View reviewed changes

matthewhughes934 force-pushed the updates-round3 branch from 677d368 to a8dbecf Compare January 17, 2025 20:16

DanielNoord approved these changes Jan 18, 2025

View reviewed changes

matthewhughes934 force-pushed the updates-round3 branch from a8dbecf to e316b9b Compare January 20, 2025 11:37

staticdev added the enhancement New feature or request label Jan 20, 2025

staticdev approved these changes Jan 20, 2025

View reviewed changes

staticdev requested changes Jan 20, 2025

View reviewed changes

matthewhughes934 force-pushed the updates-round3 branch 2 times, most recently from 544d4db to 4f38a97 Compare January 20, 2025 19:37

matthewhughes934 added 2 commits January 20, 2025 20:49

Update bugbear

0eaafa0

And fix some issues from new `bugbear`: tests/unit/test_setuptools_command.py:15:5: B036 Don't except `BaseException` unless you plan to re-raise it. tests/unit/test_setuptools_command.py:30:5: B036 Don't except `BaseException` unless you plan to re-raise it.

matthewhughes934 force-pushed the updates-round3 branch from 4f38a97 to 0eaafa0 Compare January 20, 2025 20:55

DanielNoord approved these changes Jan 20, 2025

View reviewed changes

staticdev approved these changes Jan 20, 2025

View reviewed changes

staticdev merged commit 7b1a378 into PyCQA:main Jan 20, 2025

	flake8-bugbear = ">=22.12.6,<25.0.0"
	flake8-bugbear = ">=24.12.12"

Uh oh!

Conversation

matthewhughes934 commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthewhughes934 commented Jan 14, 2025

Uh oh!

codecov Bot commented Jan 14, 2025 • 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!

matthewhughes934 commented Jan 17, 2025

Uh oh!

DanielNoord left a comment

Choose a reason for hiding this comment

Uh oh!

staticdev left a comment

Choose a reason for hiding this comment

Uh oh!

matthewhughes934 commented Jan 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthewhughes934 commented Jan 20, 2025

Uh oh!

staticdev commented Jan 20, 2025

Uh oh!

matthewhughes934 commented Jan 20, 2025

Uh oh!

staticdev commented Jan 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

matthewhughes934 commented Jan 14, 2025 •

edited

Loading

codecov Bot commented Jan 14, 2025 •

edited

Loading

matthewhughes934 commented Jan 20, 2025 •

edited

Loading