Skip to content

TYP: indexes #37224

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

TYP: indexes #37224

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4668fb8
TYP: plotting._matplotlib.converter
jbrockmendel Oct 18, 2020
26414f1
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 18, 2020
0e2c353
TYP: indexes
jbrockmendel Oct 18, 2020
f55eb60
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 22, 2020
9e5c552
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 23, 2020
1a10e74
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 24, 2020
7ef7c56
use @doc for PeriodIndex props
jbrockmendel Oct 24, 2020
96ed502
revert
jbrockmendel Oct 24, 2020
ff2bcca
dummy commit to force CI
jbrockmendel Oct 25, 2020
9b1784d
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 27, 2020
a3c4b99
update comment
jbrockmendel Oct 27, 2020
05e2590
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 27, 2020
6e666ef
Merge branch 'master' of https://github.com/pandas-dev/pandas into ty…
jbrockmendel Oct 27, 2020
3ca562c
suggested updates
jbrockmendel Oct 27, 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
revert
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 24, 2020
commit 96ed502a3eb9c7ba81bcc1c6d3ed2bf8e42cbe73
5 changes: 1 addition & 4 deletions pandas/core/indexes/datetimelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
from pandas.core.tools.timedeltas import to_timedelta

if TYPE_CHECKING:
from pandas import CategoricalIndex, DatetimeIndex
from pandas import CategoricalIndex

_index_doc_kwargs = dict(ibase._index_doc_kwargs)

Expand Down Expand Up @@ -944,9 +944,6 @@ def _maybe_utc_convert(self, other):
raise TypeError("Cannot join tz-naive with tz-aware DatetimeIndex")

if not timezones.tz_compare(self.tz, other.tz):
self = cast("DatetimeIndex", self)
other = cast("DatetimeIndex", other)

this = self.tz_convert("UTC")
other = other.tz_convert("UTC")
return this, other
Expand Down