10000 REF: avoid special case in DTA/TDA.median, flesh out tests by jbrockmendel · Pull Request #37423 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

REF: avoid special case in DTA/TDA.median, flesh out tests #37423

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 7 commits into from
Oct 31, 2020
Merged

REF: avoid special case in DTA/TDA.median, flesh out tests #37423

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65fe4e4
REF: avoid special case in DTA/TDA.median, flesh out tests
jbrockmendel Oct 26, 2020
178f3e3
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Oct 26, 2020
c52b0bc
suppress warning
jbrockmendel Oct 26, 2020
52497db
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Oct 29, 2020
956bd95
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Oct 30, 2020
533e72c
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Oct 30, 2020
ea9384a
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Oct 31, 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 branch 'master' of https://github.com/pandas-dev/pandas into re… 
…f-dtlike-mean-median
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 29, 2020
commit 52497db843ab5426e6073c6de65d06f4b656f09d
1 change: 1 addition & 0 deletions pandas/core/nanops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ def _wrap_results(result, dtype: DtypeObj, fill_value=None):
if result == fill_value:
result = np.nan
if tz is not None:
# we get here e.g. via nanmean when we call it on a DTA[tz]
result = Timestamp(result, tz=tz)
elif isna(result):
result = np.datetime64("NaT", "ns")
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0