New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add some missing or incorrect types to peewee #12251

Merged

JelleZijlstra merged 11 commits into python:main from dhorkel:dhorkel/peewee-fixes

Jul 21, 2024

Contributor

dhorkel commented Jul 1, 2024

I discovered some return types in for peewee were incorrect (reported here: #12250). I decided to add some more types where it seemed straightforward.

This is my first attempt to contribute so apologies for any mistakes :)


          add some missing or incorrect types to peewee

JelleZijlstra reviewed

View reviewed changes

stubs/peewee/peewee.pyi Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view


          fix type for comparison functions

ce05f50

This comment has been minimized.

Sign in to view

Member

JelleZijlstra commented Jul 4, 2024

You may need to add some type ignores to fix the CI errors:

stubs/peewee/peewee.pyi:153: error: Return type "Expression | bool" of "__eq__" incompatible with return type "bool" in supertype "object"  [override]
stubs/peewee/peewee.pyi:154: error: Return type "Expression | bool" of "__ne__" incompatible with return type "bool" in supertype "object"  [override]
stubs/peewee/peewee.pyi:256: error: Return type "Expression" of "__eq__" incompatible with return type "bool" in supertype "object"  [override]
stubs/peewee/peewee.pyi:257: error: Return type "Expression" of "__ne__" incompatible with return type "bool" in supertype "object"  [override]
stubs/peewee/peewee.pyi:1477: error: Return type "bool" of "__eq__" incompatible with return type "Expression" in supertype "ColumnBase"  [override]
stubs/peewee/peewee.pyi:1478: error: Return type "bool" of "__ne__" incompatible with return type "Expression" in supertype "ColumnBase"  [override]


          add override decorator to __eq__ and __ne__

0f4d94c

This comment has been minimized.

Sign in to view

Derek Horkel added 2 commits

July 18, 2024 22:32


          Revert "add override decorator to __eq__ and __ne__"

2fd6612

This reverts commit 0f4d94c.


          add ignore for override type errors

b6ebc26

This comment has been minimized.

Sign in to view


          fix types for __eq__/__ne__ for Model and CompositeKey

6d13c34

This comment has been minimized.

Sign in to view


          fix callable arguments to Any, Any

24da986

This comment has been minimized.

Sign in to view


          Fix callable arguments to use Self, specify return type for BitwiseMi…

1bae82a

…xin functions

This comment has been minimized.

Sign in to view


          Specify argument types for BitwiseMixin to match ColumnBase

011a46c

This comment has been minimized.

Sign in to view


          revert types for __and__/__or__/__sub__ for ColumnBase and BitwisMixI…

7449d0f

…n to avoid incompatible definition issue

This comment has been minimized.

Sign in to view


          Merge branch 'main' into dhorkel/peewee-fixes

68e4dcf

Contributor

github-actions bot commented Jul 19, 2024

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

JelleZijlstra merged commit aae471f into python:main

48 checks passed

max-muoto pushed a commit to max-muoto/typeshed that referenced this pull request


          add some missing or incorrect types to peewee (python#12251)

a2be370

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment