10000 ENH: Implement Keyword Aggregation for DataFrame.agg and Series.agg by charlesdong1991 · Pull Request #29116 · pandas-dev/pandas · GitHub
[go: up one dir, main page]

Skip to content

ENH: Implement Keyword Aggregation for DataFrame.agg and Series.agg #29116

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.

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 148 commits into from
Jul 10, 2020
Merged
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
7e461a1
remove \n from docstring
charlesdong1991 Dec 3, 2018
1314059
fix conflicts
charlesdong1991 Jan 19, 2019
8bcb313
Merge remote-tracking branch 'upstream/master'
charlesdong1991 Jul 30, 2019
7bc368d
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Oct 20, 2019
cf5c6c3
Implement agg for DataFrame
charlesdong1991 Oct 20, 2019
5298331
fix conflict
charlesdong1991 Oct 20, 2019
4fb74b5
remove unused import
charlesdong1991 Oct 20, 2019
97209be
remove print
charlesdong1991 Oct 20, 2019
ca273ff
fix test
charlesdong1991 Oct 20, 2019
1d2ab15
fix typo
charlesdong1991 Oct 20, 2019
3ca193c
add keyword agg for series
charlesdong1991 Oct 20, 2019
c8f80ed
fix linting
charlesdong1991 Oct 20, 2019
8c738e9
fix PY35 issue
charlesdong1991 Oct 21, 2019
d4d9ea4
try to fix py35 order issue
charlesdong1991 Oct 21, 2019
2a6de27
test if fixed
charlesdong1991 Oct 21, 2019
21e09f9
test again
charlesdong1991 Oct 21, 2019
058a8e9
simpler code
charlesdong1991 Oct 21, 2019
0da68d8
test py35
charlesdong1991 Oct 22, 2019
15e3659
fix conflict
charlesdong1991 Oct 22, 2019
438398d
test PY35
charlesdong1991 Oct 23, 2019
d47b790
try to fix py35
charlesdong1991 Oct 23, 2019
832b8d9
find py35 output
charlesdong1991 Oct 23, 2019
5a3b690
test py35
charlesdong1991 Oct 23, 2019
4fb86f0
retest py35
charlesdong1991 Oct 23, 2019
a1369bf
retest py35
charlesdong1991 Oct 23, 2019
ef981a3
try to fix py35
charlesdong1991 Oct 23, 2019
82c8960
try to fix py35
charlesdong1991 Oct 23, 2019
c610391
try one more time
charlesdong1991 Oct 23, 2019
679ba59
fix typo
charlesdong1991 Oct 23, 2019
2ee2628
py35
charlesdong1991 Oct 23, 2019
31f7033
skip PY35
charlesdong1991 Oct 23, 2019
2acb244
skip py35
charlesdong1991 Oct 23, 2019
dfbd67a
fix typo
charlesdong1991 Oct 23, 2019
ff5e60f
skip all py35
charlesdong1991 Oct 23, 2019
7c6c891
skip py35 for series
charlesdong1991 Oct 23, 2019
3e55fcb
fix test
charlesdong1991 Oct 23, 2019
6d74b29
skip series py35
charlesdong1991 Oct 23, 2019
532337e
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Oct 29, 2019
400ff3e
merge master and remove helper
charlesdong1991 Nov 8, 2019
05af2de
remove helper
charlesdong1991 Nov 8, 2019
6206fa4
remove py36
charlesdong1991 Nov 8, 2019
34199ad
put back imports
charlesdong1991 Nov 8, 2019
15d099c
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Nov 8, 2019
c56f05f
avoid circular dependency
charlesdong1991 Nov 8, 2019
d3f0620
fix linting
charlesdong1991 Nov 8, 2019
20ecfda
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Dec 19, 2019
89b8e6b
code change based on review
charlesdong1991 Dec 20, 2019
8aa1cc9
remove util
charlesdong1991 Dec 20, 2019
091ca75
Add docstring
charlesdong1991 Dec 20, 2019
c2d5104
fix circular import
charlesdong1991 Dec 20, 2019
50ebdaf
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jan 3, 2020
0484f5e
reorg and deduplicate
charlesdong1991 Jan 3, 2020
425c802
remove used imports
charlesdong1991 Jan 3, 2020
d5c2c6c
fix linting
charlesdong1991 Jan 3, 2020
8bb9714
fix wrong import
charlesdong1991 Jan 3, 2020
2607c5d
fix conflict
charlesdong1991 Jan 3, 2020
0545231
isort
charlesdong1991 Jan 3, 2020
0a27889
fix mypy
charlesdong1991 Jan 3, 2020
a66053e
Code change based on review
charlesdong1991 Jan 6, 2020
7311ef0
dropna
charlesdong1991 Jan 6, 2020
da2ff37
fix logic
charlesdong1991 Jan 7, 2020
bcc5bc3
fix logic
charlesdong1991 Jan 7, 2020
0825027
remove unused
charlesdong1991 Jan 7, 2020
d3c35f5
fix linting
charlesdong1991 Jan 7, 2020
cef2b50
simpler python
charlesdong1991 Jan 7, 2020
b96a942
fix conflicts
charlesdong1991 Jan 8, 2020
3123284
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jan 9, 2020
7bb3bd0
fix conflicts
charlesdong1991 Jan 21, 2020
3da2e2a
fix merge error
charlesdong1991 Jan 21, 2020
3ce91fc
fixup
charlesdong1991 Jan 21, 2020
1426ee2
fix annotation
charlesdong1991 Jan 21, 2020
5893a0e
fix annotation
charlesdong1991 Jan 21, 2020
cc85db4
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jan 23, 2020
0f55073
move code
charlesdong1991 Jan 25, 2020
90d52ba
move it back
charlesdong1991 Jan 25, 2020
381a697
fixup
charlesdong1991 Jan 25, 2020
238b4cc
add docstring
charlesdong1991 Jan 25, 2020
f8e1891
add func
charlesdong1991 Jan 25, 2020
66e9b38
isort
charlesdong1991 Jan 25, 2020
f4d8a4f
fix linting
charlesdong1991 Jan 26, 2020
c3e34a0
fix linting
charlesdong1991 Jan 26, 2020
0c0dbad
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jan 26, 2020
61f6201
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jan 28, 2020
88c7751
code change on JR reviews
charlesdong1991 Feb 2, 2020
e2b957a
move
charlesdong1991 Feb 2, 2020
99f75b2
linting
charlesdong1991 Feb 2, 2020
30b7296
isort
charlesdong1991 Feb 2, 2020
baea583
code change
charlesdong1991 Feb 12, 2020
04bffe6
add docstring
charlesdong1991 Feb 12, 2020
42091c3
add None back
charlesdong1991 Feb 12, 2020
fc13e19
fix annotation
charlesdong1991 Feb 12, 2020
1403426
better annotation
charlesdong1991 Feb 12, 2020
3d9655e
fix annotation
charlesdong1991 Feb 12, 2020
d78c57c
fix annotation
charlesdong1991 Feb 12, 2020
0487928
fix linting
charlesdong1991 Feb 16, 2020
7435ac5
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Feb 19, 2020
f1cd16c
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Feb 23, 2020
469691c
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Feb 24, 2020
1bb35b5
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Feb 27, 2020
7a6f496
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Mar 15, 2020
3730f7d
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Mar 30, 2020
cd8d00f
simpler python
charlesdong1991 Mar 30, 2020
6dddd55
simpler python
charlesdong1991 Mar 30, 2020
96dc3ed
fixup
charlesdong1991 Mar 30, 2020
075b85b
simplification
charlesdong1991 Mar 30, 2020
a44471c
better docs
charlesdong1991 Mar 30, 2020
0e2eae4
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Apr 10, 2020
2fb4b27
add docs
charlesdong1991 Apr 10, 2020
5e04185
focs
charlesdong1991 Apr 10, 2020
56d0f89
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Apr 10, 2020
7f4839e
fix doc
charlesdong1991 Apr 10, 2020
65d578b
fixup
charlesdong1991 Apr 10, 2020
3e6a06c
fix up
charlesdong1991 Apr 10, 2020
8651447
fix doctest
charlesdong1991 Apr 10, 2020
a7439fe
doctest
charlesdong1991 Apr 11, 2020
449d40f
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Apr 11, 2020
9fd8ec5
rebuild
charlesdong1991 Apr 11, 2020
736bea2
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Apr 15, 2020
d20be20
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 May 10, 2020
35b2b17
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 May 22, 2020
74d6169
fixup and resolve conflict and merge master
charlesdong1991 Jun 16, 2020
0546224
cleaner code
charlesdong1991 Jun 16, 2020
f5f0e68
rename
charlesdong1991 Jun 16, 2020
54ff962
linting
charlesdong1991 Jun 16, 2020
ac57023
init
charlesdong1991 Jun 16, 2020
484e42c
better doc
charlesdong1991 Jun 17, 2020
47e6598
complex case
charlesdong1991 Jun 17, 2020
f28b452
linting
charlesdong1991 Jun 17, 2020
81b4186
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jun 17, 2020
1fd4b5b
resolve conflict and merge master
charlesdong1991 Jun 19, 2020
47dc5fe
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jun 20, 2020
9190f7f
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jun 20, 2020
89de59e
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jun 23, 2020
8493383
add typing
charlesdong1991 Jun 25, 2020
9a9dd7f
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jun 25, 2020
c75c882
black
charlesdong1991 Jun 25, 2020
fa61db7
remove line
charlesdong1991 Jun 25, 2020
00a1ccf
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jun 27, 2020
26b380a
simplify annotation
charlesdong1991 Jul 5, 2020
165ea83
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jul 5, 2020
d6923f2
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jul 8, 2020
f6a5cc1
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jul 9, 2020
a747ab6
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
charlesdong1991 Jul 10, 2020
44405e8
deprivate relabel_result
charlesdong1991 Jul 10, 2020
faea906
cleaner annotations
charlesdong1991 Jul 10, 2020
7e30a61
Merge remote-tracking branc 8000 h 'upstream/master' into nested_renaming_agg
charlesdong1991 Jul 10, 2020
3d20524
fix import sorting
charlesdong1991 Jul 10, 2020
05921af
move defined annotation inside aggregation.py
charlesdong1991 Jul 10, 2020
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into nested_renaming_agg
  • Loading branch information
charlesdong1991 committed Jul 8, 2020
commit d6923f28dfe0a533e72033d93b4d389792e1d4ba

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.

0