Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ repos:
- flake8==4.0.1
- flake8-comprehensions==3.7.0
- flake8-bugbear==21.3.2
- pandas-dev-flaker==0.4.0
- pandas-dev-flaker==0.5.0
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- gitpython # obtain contributors from git for whatsnew
- gitdb
- numpydoc
- pandas-dev-flaker=0.4.0
- pandas-dev-flaker=0.5.0
- pydata-sphinx-theme
- pytest-cython
- sphinx
Expand Down
8 changes: 2 additions & 6 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -1555,14 +1555,10 @@ def __matmul__(self, other: Series) -> Series:
...

@overload
def __matmul__(
self, other: AnyArrayLike | DataFrame | Series
) -> DataFrame | Series:
def __matmul__(self, other: AnyArrayLike | DataFrame) -> DataFrame | Series:
...

def __matmul__(
self, other: AnyArrayLike | DataFrame | Series
) -> DataFrame | Series:
def __matmul__(self, other: AnyArrayLike | DataFrame) -> DataFrame | Series:
"""
Matrix multiplication using binary `@` operator in Python>=3.5.
"""
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pyupgrade
gitpython
gitdb
numpydoc
pandas-dev-flaker==0.4.0
pandas-dev-flaker==0.5.0
pydata-sphinx-theme
pytest-cython
sphinx
Expand Down