Skip to content

TYP: pandas/core/frame.py #38416

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

Merged
merged 35 commits into from
Mar 15, 2021
Merged

TYP: pandas/core/frame.py #38416

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
46bf318
typing
arw2019 Dec 9, 2020
eba7251
typing
arw2019 Dec 11, 2020
1a45267
typing
arw2019 Dec 11, 2020
f5cb185
typing
arw2019 Dec 11, 2020
4c9b764
review comments
arw2019 Dec 11, 2020
a273e5c
review comment
arw2019 Dec 13, 2020
e0558c5
review comment
arw2019 Dec 13, 2020
e156caa
merge master
arw2019 Dec 14, 2020
13ff245
merge master
arw2019 Dec 14, 2020
617e228
revert hints to pivot_table
arw2019 Dec 14, 2020
9a4d187
take out merge
arw2019 Dec 14, 2020
77e1142
minimize diff
arw2019 Dec 14, 2020
2352e45
fix eval return type annotation
arw2019 Dec 14, 2020
a3b7b1b
merge master
arw2019 Dec 14, 2020
1c942fd
review comments
arw2019 Dec 15, 2020
0e747dd
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Dec 15, 2020
11247d9
review comments
arw2019 Dec 21, 2020
d82d81e
merge master
arw2019 Dec 21, 2020
56ee7c4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Dec 27, 2020
168cad2
review comments
arw2019 Jan 5, 2021
e12ed2e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Jan 5, 2021
6c876ff
review comments
arw2019 Jan 5, 2021
0e780ce
review comments
arw2019 Jan 5, 2021
a93489a
review: remove NpDtype usage
arw2019 Jan 6, 2021
2cd6823
merge master
arw2019 Jan 6, 2021
3e39e44
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Jan 10, 2021
a28deaf
merge master
arw2019 Feb 11, 2021
9243c6b
merge master
arw2019 Feb 21, 2021
58fcad8
typing
arw2019 Feb 21, 2021
ff317d3
restore return type for memory_usage
arw2019 Feb 22, 2021
02647b5
remove return type for _series
arw2019 Feb 22, 2021
cc517a5
rogue comma
arw2019 Feb 22, 2021
666533c
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
arw2019 Feb 22, 2021
5d08d71
Merge remote-tracking branch 'upstream/master' into typing-frame
simonjayhawkins Mar 14, 2021
3b52fc9
Merge remote-tracking branch 'upstream/master' into typing-frame
simonjayhawkins Mar 15, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge master
  • Loading branch information
@arw2019
arw2019 committed Feb 21, 2021
commit 9243c6b98db057b9cae3e4092b096b4a8f7b75a6
4 changes: 2 additions & 2 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4697,7 +4697,7 @@ def _replace_columnwise(
def shift(
self,
periods=1,
freq=None,
freq: Optional[Frequency] = None,
axis: Axis = 0,
fill_value=lib.no_default,
) -> DataFrame:
Expand Down Expand Up @@ -9550,7 +9550,7 @@ def resample(

def to_timestamp(
self,
freq=None,
freq: Optional[Frequency] = None,
how: str = "start",
axis: Axis = 0,
copy: bool = True,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.