Skip to content

REF: DatetimeLikeArray #24024

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 220 commits into from
Jan 2, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
220 commits
Select commit Hold shift + click to select a range
e9c8418
Squashed commit of the following:
TomAugspurger Nov 30, 2018
80d9576
Squashed commit of the following:
TomAugspurger Nov 30, 2018
acd5b6d
Squashed commit of the following:
TomAugspurger Nov 30, 2018
f364f77
REF: DatetimeArray
TomAugspurger Nov 30, 2018
56d9af6
fixup! REF: DatetimeArray
TomAugspurger Nov 30, 2018
538db1f
fixup! REF: DatetimeArray
TomAugspurger Nov 30, 2018
6620b0f
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 3, 2018
4842e53
fixup
TomAugspurger Dec 3, 2018
a7c1d42
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 3, 2018
07586d9
fixup
TomAugspurger Dec 3, 2018
7ebb9ee
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 4, 2018
e843984
REF: Move dispatched properties to array, not like
TomAugspurger Dec 4, 2018
67a9cf9
TST: Work around statsmodels bug (#24090)
TomAugspurger Dec 4, 2018
09837ac
fixups
TomAugspurger Dec 4, 2018
f3f9142
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 4, 2018
7c76b3e
fixups
TomAugspurger Dec 5, 2018
eae133d
fixups
TomAugspurger Dec 5, 2018
165f3fd
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 5, 2018
7ec7351
Squashed commit of the following:
TomAugspurger Dec 5, 2018
e7538e6
Fixed: where
TomAugspurger Dec 5, 2018
4f1ee37
revert constructor change
TomAugspurger Dec 5, 2018
a117de4
some cleanups
TomAugspurger Dec 5, 2018
1f463a1
Squashed commit of the following:
TomAugspurger Dec 6, 2018
d5fdc21
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 6, 2018
98182b1
Fixed IO pytables
TomAugspurger Dec 6, 2018
d4c9521
wip:constructor
TomAugspurger Dec 6, 2018
c22a30a
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 7, 2018
abd019a
Squashed commit of the following:
TomAugspurger Dec 7, 2018
4e9608e
Boxing compat
TomAugspurger Dec 7, 2018
4988630
test fixups
TomAugspurger Dec 7, 2018
3eb8432
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 7, 2018
2a562b8
Revert "Squashed commit of the following:"
TomAugspurger Dec 7, 2018
f4cbf36
hacky where fix
TomAugspurger Dec 7, 2018
b366968
basic unstack test
TomAugspurger Dec 7, 2018
fef6847
where fixups
TomAugspurger Dec 7, 2018
9c19b8c
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 7, 2018
3970f62
Cleanup
TomAugspurger Dec 7, 2018
9a50f92
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 8, 2018
ebb4009
unxfail
TomAugspurger Dec 8, 2018
57b401e
lint
TomAugspurger Dec 8, 2018
0a61ba8
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 9, 2018
323bfeb
clarify _values behavior
TomAugspurger Dec 9, 2018
2c1719f
remove xfail
TomAugspurger Dec 9, 2018
62bf6c6
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 10, 2018
0a8ccfd
[WIP]: Fixed groupby resample
TomAugspurger Dec 10, 2018
d5f2ac2
wip
TomAugspurger Dec 10, 2018
831d91a
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 10, 2018
e69ba08
EA-Where cleanup
TomAugspurger Dec 10, 2018
c31b80e
wip: remove wrap_array_method
TomAugspurger Dec 10, 2018
b4a0dc6
wip: more dispatching
TomAugspurger Dec 10, 2018
8c0641b
wip: py2 compat
TomAugspurger Dec 10, 2018
5d7dfda
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 10, 2018
580f7ba
old DTI pickle compat
TomAugspurger Dec 10, 2018
c41ec57
REF: TDA Constructor
TomAugspurger Dec 10, 2018
558adf8
WIP: Fix json serialization
TomAugspurger Dec 6, 2018
6586bcd
fixup! WIP: Fix json serialization
TomAugspurger Dec 11, 2018
5777ed0
TDA Constructor fixups
TomAugspurger Dec 11, 2018
d20291f
Constructors
TomAugspurger Dec 11, 2018
0f231e7
versionadded
TomAugspurger Dec 11, 2018
5f473df
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 11, 2018
c3b7dea
Ops updates
TomAugspurger Dec 11, 2018
074eed9
Cleanup
TomAugspurger Dec 11, 2018
02145d9
edge cases
TomAugspurger Dec 11, 2018
bf57186
fixups
TomAugspurger Dec 11, 2018
af34a0d
32-bit compat
TomAugspurger Dec 11, 2018
d557976
32-bit compat
TomAugspurger Dec 12, 2018
87f18e3
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 12, 2018
afc4c4a
Astype fixups
TomAugspurger Dec 12, 2018
3702801
doc comment
TomAugspurger Dec 12, 2018
119575f
32-bit compat
TomAugspurger Dec 12, 2018
0cd6958
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 12, 2018
4371ed0
TST: tighten up matches
TomAugspurger Dec 12, 2018
629e8e5
Add API breaking release notes
TomAugspurger Dec 12, 2018
a9a2101
Unique docstring
TomAugspurger Dec 12, 2018
4c460c6
py27, 64bit compat
TomAugspurger Dec 12, 2018
ac734b3
maybe fix 0.24 syntax
TomAugspurger Dec 12, 2018
b485e5a
Large cleanup
TomAugspurger Dec 12, 2018
f7d9cdb
BUG: Fixed DataFrame.values for 1 column DataFrame
TomAugspurger Dec 12, 2018
a86e4cb
Cleanup
TomAugspurger Dec 13, 2018
462a4f7
Hide one
TomAugspurger Dec 13, 2018
b901c3d
JSON comments
TomAugspurger Dec 13, 2018
4bf1862
Fixups
TomAugspurger Dec 13, 2018
7dd3ba5
Some cleanups
TomAugspurger Dec 13, 2018
87101bf
Fixup DatetimeTZBlock.get_values
TomAugspurger Dec 13, 2018
8c6f2db
Fixed datetimelike-max
TomAugspurger Dec 13, 2018
6bfd919
Document IncompatibleTimezoneError
TomAugspurger Dec 13, 2018
4cb6c50
Update concat test
TomAugspurger Dec 13, 2018
4c1609a
dispatch _to_json_values
TomAugspurger Dec 13, 2018
e7505cd
clarifying comments
TomAugspurger Dec 13, 2018
8060edd
Added check for ABCDatetimeArray & ABCPeriodArray
TomAugspurger Dec 13, 2018
55f6c26
Docstring for DatetimeTZDtype
TomAugspurger Dec 13, 2018
ef11a07
Use super for _add_delta
TomAugspurger Dec 13, 2018
17a3bbb
Remove redundant properties
TomAugspurger Dec 13, 2018
48f85f0
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 13, 2018
4ec0284
Dispatch tz, tzinfo
TomAugspurger Dec 13, 2018
aa82a0b
Updates
TomAugspurger Dec 13, 2018
d7dcd79
Added some docs
TomAugspurger Dec 13, 2018
34c2bd1
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 14, 2018
d0a266e
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 14, 2018
94fd88b
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 14, 2018
75df1c9
Print wrong dtype
TomAugspurger Dec 14, 2018
82c998a
Fix new failures
TomAugspurger Dec 14, 2018
9252c75
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 14, 2018
512af69
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 15, 2018
80b3455
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 16, 2018
87c125b
Update for comments
TomAugspurger Dec 16, 2018
b9f2d4e
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 17, 2018
a695eb8
minor cleanups
TomAugspurger Dec 17, 2018
bbc5f1b
Remove ref_to_data, deepcopy_if_needed
TomAugspurger Dec 17, 2018
a22f22c
Remove CategoricalIndex._index_data
TomAugspurger Dec 18, 2018
0aff5fa
Private _hasnans
TomAugspurger Dec 18, 2018
90a937f
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 18, 2018
1566c1e
really remove _deepcopy_if_needed
TomAugspurger Dec 18, 2018
cc80a8e
removed nbs
TomAugspurger Dec 18, 2018
58f3421
CLN: Removed unused wrap_array_method and accessor
TomAugspurger Dec 18, 2018
99bc78e
Remove unused setop handling
TomAugspurger Dec 18, 2018
ee48dc0
Notes on _index_data
TomAugspurger Dec 18, 2018
6e487c6
clarify comment
TomAugspurger Dec 18, 2018
f4aa1f8
Cleanups
TomAugspurger Dec 18, 2018
d81c204
Updates
TomAugspurger Dec 19, 2018
d821927
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 19, 2018
617a172
remove IncompatibleTimezoneError
TomAugspurger Dec 19, 2018
32ef700
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 19, 2018
0a0df77
add nonexistent
TomAugspurger Dec 19, 2018
169eae6
Fixed to_numpy on datetimetz
TomAugspurger Dec 19, 2018
be4335d
Try removing index _generate_ranges
TomAugspurger Dec 19, 2018
203a5a6
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 19, 2018
fab4c33
use _data
TomAugspurger Dec 19, 2018
89b5b51
Check before unboxing
TomAugspurger Dec 19, 2018
b2afd4e
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 20, 2018
a874f5f
na in unbox
TomAugspurger Dec 20, 2018
0eb28e8
Try removing freq infer
TomAugspurger Dec 20, 2018
42dfd30
bits of 24364
jbrockmendel Dec 20, 2018
f62544a
Merge pull request #6 from jbrockmendel/disown2
TomAugspurger Dec 21, 2018
2e30a56
Updates
TomAugspurger Dec 21, 2018
af815f8
Small updates
TomAugspurger Dec 21, 2018
b046791
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 21, 2018
4522dfe
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 21, 2018
eb594e7
Merge branch 'master' of https://github.com/pandas-dev/pandas into di…
jbrockmendel Dec 24, 2018
0b570b1
Merge pull request #7 from jbrockmendel/disown3
TomAugspurger Dec 27, 2018
72fe4fc
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 27, 2018
7a711f9
remove DatetimeTZBlock.shift
TomAugspurger Dec 27, 2018
6530500
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 27, 2018
445e46a
Merge branch 'master' of https://github.com/pandas-dev/pandas into di…
jbrockmendel Dec 28, 2018
9ae6706
Merge pull request #8 from jbrockmendel/disown5
TomAugspurger Dec 28, 2018
60ddcb5
Merge branch 'disown-tz-only-rebased' of https://github.com/TomAugspu…
TomAugspurger Dec 28, 2018
5988477
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 28, 2018
20c23b7
matching errors
TomAugspurger Dec 28, 2018
7a5fd94
isort
TomAugspurger Dec 28, 2018
e644d8c
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 28, 2018
4d3b55e
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 28, 2018
68cde94
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 28, 2018
421435a
Merge branch 'master' of https://github.com/pandas-dev/pandas into di…
jbrockmendel Dec 29, 2018
bbf7fa4
Merge pull request #9 from jbrockmendel/disown7
TomAugspurger Dec 29, 2018
324d452
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 29, 2018
cdec2a8
Removed pandas_registry and related tests
TomAugspurger Dec 29, 2018
e66c18b
Updates
TomAugspurger Dec 29, 2018
09c2c91
wrong branch
TomAugspurger Dec 29, 2018
6373948
Fix mixup from previous rebase
jbrockmendel Dec 29, 2018
e91bc09
Merge branch 'master' of https://github.com/pandas-dev/pandas into di…
jbrockmendel Dec 29, 2018
4bf00d8
Merge pull request #10 from jbrockmendel/disown8
TomAugspurger Dec 29, 2018
8cb7d9e
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 29, 2018
23fd9bb
fixup
TomAugspurger Dec 29, 2018
695010c
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 29, 2018
ec2c7af
move null-handling methods back down to null-handling section
jbrockmendel Dec 29, 2018
a499ed8
restore order of null-handling section
jbrockmendel Dec 29, 2018
a32e020
Small diff cleanups
jbrockmendel Dec 29, 2018
6d2fc99
Merge pull request #11 from jbrockmendel/na
TomAugspurger Dec 30, 2018
9342b59
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 30, 2018
c566ce8
Shift -> _data.time_shift
TomAugspurger Dec 30, 2018
f783770
Freq changes
TomAugspurger Dec 30, 2018
9502f90
Merge branch 'master' of https://github.com/pandas-dev/pandas into di…
jbrockmendel Dec 31, 2018
3e1ee5e
fix rebase scerwup
jbrockmendel Dec 31, 2018
92d8089
fix shift
jbrockmendel Dec 31, 2018
cbb90f7
fixups
jbrockmendel Dec 31, 2018
be1c968
Merge pull request #12 from jbrockmendel/disown10
TomAugspurger Dec 31, 2018
c655592
Merge branch 'disown-tz-only-rebased' of https://github.com/TomAugspu…
TomAugspurger Dec 31, 2018
8d2108a
eadata fixup
TomAugspurger Dec 31, 2018
fafa1ea
Fixed test overriting freq
TomAugspurger Dec 31, 2018
01f185b
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Dec 31, 2018
efa1c2c
remove unnecessary condition
TomAugspurger Dec 31, 2018
a65efb0
Update .array
TomAugspurger Dec 31, 2018
01115c4
Simplify diff
TomAugspurger Dec 31, 2018
9d37675
Revert eadata -> data changes
TomAugspurger Dec 31, 2018
38817a5
fix failing tests
jbrockmendel Jan 1, 2019
8fad32e
Merge pull request #13 from jbrockmendel/cifix
TomAugspurger Jan 1, 2019
5dbc63a
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 1, 2019
7de78f1
Merge branch 'disown-tz-only-rebased' of https://github.com/TomAugspu…
TomAugspurger Jan 1, 2019
7544bcf
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 1, 2019
39a2a67
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 1, 2019
6e90823
import
TomAugspurger Jan 1, 2019
9e61b5b
Fixed failing test
TomAugspurger Jan 1, 2019
0be63a6
Try reverting dt64arr_to_periodarr
TomAugspurger Jan 1, 2019
90700fb
Minor fixups
TomAugspurger Jan 1, 2019
c77d49c
comment
TomAugspurger Jan 1, 2019
1499344
maybe unnecessary isinstance
TomAugspurger Jan 1, 2019
38a6eb6
Use class
TomAugspurger Jan 1, 2019
b7253d7
32-bit compat
TomAugspurger Jan 1, 2019
f11f07f
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 1, 2019
ca11d27
Fixup merge
TomAugspurger Jan 1, 2019
4c2a620
use to_numpy
TomAugspurger Jan 1, 2019
adddef2
try returning dt64arr
TomAugspurger Jan 1, 2019
9498554
fixup! try returning dt64arr
TomAugspurger Jan 1, 2019
4f1c212
try simplifying categorical case
TomAugspurger Jan 1, 2019
40cdca8
abc
TomAugspurger Jan 1, 2019
756a4b6
Remove DatetimeIndexOpsMixin.__getitem__
TomAugspurger Jan 1, 2019
aea0e05
Remove DatetimeIndexOpsMixin.view
TomAugspurger Jan 1, 2019
dfa7fea
comment
TomAugspurger Jan 1, 2019
cc8b1ca
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 1, 2019
6a2e1a1
Fixup merge
TomAugspurger Jan 1, 2019
b84bef1
Remove unused _time_shift
TomAugspurger Jan 1, 2019
69ed3d4
diff reduction
jbrockmendel Jan 2, 2019
4110b4c
Merge pull request #14 from jbrockmendel/reduction
TomAugspurger Jan 2, 2019
ce5f3b9
just index
TomAugspurger Jan 2, 2019
4c76ae1
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 2, 2019
ef36be1
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 2, 2019
ad4ea4d
fixup merge
TomAugspurger Jan 2, 2019
14a13b0
isort
TomAugspurger Jan 2, 2019
5c8d3c6
remove block
TomAugspurger Jan 2, 2019
2436214
Merge remote-tracking branch 'upstream/master' into disown-tz-only-re…
TomAugspurger Jan 2, 2019
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
Squashed commit of the following:
commit 9e0d87d
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Fri Dec 7 07:18:58 2018 -0600

    update docs, cleanup

commit 1271d3d
Merge: 033ac9c f74fc59
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Fri Dec 7 07:12:49 2018 -0600

    Merge remote-tracking branch 'upstream/master' into ea-where

commit 033ac9c
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Fri Dec 7 06:30:18 2018 -0600

    Setitem-based where

commit e9665b8
Merge: 5e14414 03134cb
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Thu Dec 6 21:38:42 2018 -0600

    Merge remote-tracking branch 'upstream/master' into ea-where

commit 5e14414
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Thu Dec 6 09:18:54 2018 -0600

    where versionadded

commit d90f384
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Thu Dec 6 09:17:43 2018 -0600

    deprecation note for categorical

commit 4715ef6
Merge: edff47e b78aa8d
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Thu Dec 6 08:15:26 2018 -0600

    Merge remote-tracking branch 'upstream/master' into ea-where

commit edff47e
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Thu Dec 6 08:15:21 2018 -0600

    32-bit compat

commit badb5be
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Thu Dec 6 06:21:44 2018 -0600

    compat, revert

commit 911a2da
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Wed Dec 5 15:55:24 2018 -0600

    debug 32-bit issue

commit a69dbb3
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Wed Dec 5 15:49:17 2018 -0600

    warn for categorical

commit 6f79282
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Wed Dec 5 12:45:54 2018 -0600

    32-bit compat

commit 56470c3
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Wed Dec 5 11:39:48 2018 -0600

    Fixups:

    * Ensure data generated OK.
    * Remove erroneous comments about alignment. That was user error.

commit c4604df
Author: Tom Augspurger <tom.w.augspurger@gmail.com>
Date:   Mon Dec 3 14:23:25 2018 -0600

    API: Added ExtensionArray.where

    We need some way to do `.where` on EA object for DatetimeArray. Adding it
    to the interface is, I think, the easiest way.

    Initially I started to write a version on ExtensionBlock, but it proved
    to be unwieldy. to write a version that performed well for all types.
    It *may* be possible to do using `_ndarray_values` but we'd need a few more
    things around that (missing values, converting an arbitrary array to the
    "same' ndarary_values, error handling, re-constructing). It seemed easier
    to push this down to the array.

    The implementation on ExtensionArray is readable, but likely slow since
    it'll involve a conversion to object-dtype.

    Closes #24077
  • Loading branch information
TomAugspurger committed Dec 7, 2018
commit abd019af5cc0be0af6079924bdbe9ebd0297be5f
3 changes: 3 additions & 0 deletions doc/source/whatsnew/v0.24.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,8 @@ Deprecations
- :func:`pandas.types.is_datetimetz` is deprecated in favor of `pandas.types.is_datetime64tz` (:issue:`23917`)
- Creating a :class:`TimedeltaIndex` or :class:`DatetimeIndex` by passing range arguments `start`, `end`, and `periods` is deprecated in favor of :func:`timedelta_range` and :func:`date_range` (:issue:`23919`)
- Passing a string alias like ``'datetime64[ns, UTC]'`` as the `unit` parameter to :class:`DatetimeTZDtype` is deprecated. Use :class:`DatetimeTZDtype.construct_from_string` instead (:issue:`23990`).
- In :meth:`Series.where` with Categorical data, providing an ``other`` that is not present in the categories is deprecated. Convert the categorical to a different dtype first, or add the ``other`` to the categories first (:issue:`24077`).


.. _whatsnew_0240.deprecations.datetimelike_int_ops:

Expand Down Expand Up @@ -1308,6 +1310,7 @@ Datetimelike
- Bug in :class:`DatetimeIndex` where calling ``np.array(dtindex, dtype=object)`` would incorrectly return an array of ``long`` objects (:issue:`23524`)
- Bug in :class:`Index` where passing a timezone-aware :class:`DatetimeIndex` and `dtype=object` would incorrectly raise a ``ValueError`` (:issue:`23524`)
- Bug in :class:`Index` where calling ``np.array(dtindex, dtype=object)`` on a timezone-naive :class:`DatetimeIndex` would return an array of ``datetime`` objects instead of :class:`Timestamp` objects, potentially losing nanosecond portions of the timestamps (:issue:`23524`)
- Bug in :class:`Categorical.__setitem__` not allowing setting with another ``Categorical`` when both are undordered and have the same categories, but in a different order (:issue:`24142`)

Timedelta
^^^^^^^^^
Expand Down
3 changes: 3 additions & 0 deletions pandas/compat/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def get_range_parameters(data):
reduce = functools.reduce
long = int
unichr = chr
import reprlib

# This was introduced in Python 3.3, but we don't support
# Python 3.x < 3.5, so checking PY3 is safe.
Expand Down Expand Up @@ -271,6 +272,7 @@ class to receive bound method
class_types = type,
text_type = str
binary_type = bytes
import reprlib

def u(s):
return s
Expand Down Expand Up @@ -323,6 +325,7 @@ def set_function_name(f, name, cls):
class_types = (type, types.ClassType)
text_type = unicode
binary_type = str
import repr as reprlib

def u(s):
return unicode(s, "unicode_escape")
Expand Down
2 changes: 2 additions & 0 deletions pandas/core/arrays/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ def __setitem__(self, key, value):
# example, a string like '2018-01-01' is coerced to a datetime
# when setting on a datetime64ns array. In general, if the
# __init__ method coerces that value, then so should __setitem__
# Note, also, that Series/DataFrame.where internally use __setitem__
# on a copy of the data.
raise NotImplementedError(_not_implemented_message.format(
type(self), '__setitem__')
)
Expand Down
12 changes: 11 additions & 1 deletion pandas/core/arrays/categorical.py
Original file line number Diff line number Diff line change
Expand Up @@ -2121,11 +2121,21 @@ def __setitem__(self, key, value):
`Categorical` does not have the same categories
"""

if isinstance(value, (ABCIndexClass, ABCSeries)):
value = value.array

# require identical categories set
if isinstance(value, Categorical):
if not value.categories.equals(self.categories):
if not is_dtype_equal(self, value):
raise ValueError("Cannot set a Categorical with another, "
"without identical categories")
if not self.categories.equals(value.categories):
new_codes = _recode_for_categories(
value.codes, value.categories, self.categories
)
value = Categorical.from_codes(new_codes,
categories=self.categories,
ordered=self.ordered)

rvalue = value if is_list_like(value) else [value]

Expand Down
5 changes: 0 additions & 5 deletions pandas/core/arrays/sparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -704,11 +704,6 @@ def __array__(self, dtype=None, copy=True):
out[self.sp_index.to_int_index().indices] = self.sp_values
return out

def __setitem__(self, key, value):
# I suppose we could allow setting of non-fill_value elements.
msg = "SparseArray does not support item assignment via setitem"
raise TypeError(msg)

@classmethod
def _from_sequence(cls, scalars, dtype=None, copy=False):
return cls(scalars, dtype=dtype)
Expand Down
9 changes: 8 additions & 1 deletion pandas/core/indexes/category.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,14 @@ def _can_reindex(self, indexer):

@Appender(_index_shared_docs['where'])
def where(self, cond, other=None):
cat = self.values.where(cond, other=other)
# TODO: Investigate an alternative implementation with
# 1. copy the underyling Categorical
# 2. setitem with `cond` and `other`
# 3. Rebuild CategoricalIndex.
if other is None:
other = self._na_value
values = np.where(cond, self.values, other)
cat = Categorical(values, dtype=self.dtype)
return self._shallow_copy(cat, **self._get_attributes_dict())

def reindex(self, target, method=None, level=None, limit=None,
Expand Down
82 changes: 75 additions & 7 deletions pandas/core/internals/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,33 @@ def where(self, other, cond, align=True, errors='raise',
# we want to replace that with the correct NA value
# for the type
other = self.dtype.na_value
result = self.values.where(cond, other)

if is_sparse(self.values):
# ugly workaround for ensure that the dtype is OK
# after we insert NaNs.
if is_sparse(other):
otype = other.dtype.subtype
else:
otype = other
dtype = self.dtype.update_dtype(
np.result_type(self.values.dtype.subtype, otype)
)
else:
dtype = self.dtype

# rough heuristic to see if the other array implements setitem
if self._holder.__setitem__ is ExtensionArray.__setitem__:
result = self._holder._from_sequence(
np.where(cond, self.values, other),
dtype=dtype,
)
else:
result = self.values.copy()
icond = ~cond
if lib.is_scalar(other):
result[icond] = other
else:
result[icond] = other[icond]
return self.make_block_same_class(result, placement=self.mgr_locs)

@property
Expand Down Expand Up @@ -2701,13 +2727,55 @@ def concat_same_type(self, to_concat, placement=None):

def where(self, other, cond, align=True, errors='raise',
try_cast=False, axis=0, transpose=False):
result = super(CategoricalBlock, self).where(
other, cond, align, errors, try_cast, axis, transpose
# This can all be deleted in favor of ExtensionBlock.where once
# we enforce the deprecation.
object_msg = (
"Implicitly converting categorical to object-dtype ndarray. "
"The values `{}' are not present in this categorical's "
"categories. A future version of pandas will raise a ValueError "
"when 'other' contains different categories.\n\n"
"To preserve the current behavior, add the new categories to "
"the categorical before calling 'where', or convert the "
"categorical to a different dtype."
)
if result.values.dtype != self.values.dtype:
# For backwards compatability, we allow upcasting to object.
# This fallback will be removed in the future.
result = result.astype(object)

scalar_other = lib.is_scalar(other)
categorical_other = is_categorical_dtype(other)
if isinstance(other, ABCDataFrame):
# should be 1d
assert other.shape[1] == 1
other = other.iloc[:, 0]

if isinstance(other, (ABCSeries, ABCIndexClass)):
other = other._values

do_as_object = (
# Two categoricals with different dtype (ignoring order)
(categorical_other and not is_dtype_equal(self.values, other)) or
# a not-na scalar not present in our categories
(scalar_other and (other not in self.values.categories
and notna(other))) or
# an array not present in our categories
(not scalar_other and
(self.values.categories.get_indexer(
other[notna(other)]) < 0).any())
)

if do_as_object:
if scalar_other:
msg = object_msg.format(other)
else:
msg = compat.reprlib.repr(other)

warnings.warn(msg, FutureWarning, stacklevel=6)
result = self.astype(object).where(other, cond, align=align,
errors=errors,
try_cast=try_cast,
axis=axis, transpose=transpose)
else:
result = super(CategoricalBlock, self).where(
other, cond, align, errors, try_cast, axis, transpose
)
return result


Expand Down
96 changes: 79 additions & 17 deletions pandas/tests/arrays/categorical/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import numpy as np
import pytest

import pandas as pd
from pandas import Categorical, CategoricalIndex, Index, PeriodIndex, Series
import pandas.core.common as com
from pandas.tests.arrays.categorical.common import TestCategorical
Expand Down Expand Up @@ -43,6 +44,45 @@ def test_setitem(self):

tm.assert_categorical_equal(c, expected)

@pytest.mark.parametrize('other', [
pd.Categorical(['b', 'a']),
pd.Categorical(['b', 'a'], categories=['b', 'a']),
])
def test_setitem_same_but_unordered(self, other):
# GH-24142
target = pd.Categorical(['a', 'b'], categories=['a', 'b'])
mask = np.array([True, False])
target[mask] = other[mask]
expected = pd.Categorical(['b', 'b'], categories=['a', 'b'])
tm.assert_categorical_equal(target, expected)

@pytest.mark.parametrize('other', [
pd.Categorical(['b', 'a'], categories=['b', 'a', 'c']),
pd.Categorical(['b', 'a'], categories=['a', 'b', 'c']),
pd.Categorical(['a', 'a'], categories=['a']),
pd.Categorical(['b', 'b'], categories=['b']),
])
def test_setitem_different_unordered_raises(self, other):
# GH-24142
target = pd.Categorical(['a', 'b'], categories=['a', 'b'])
mask = np.array([True, False])
with pytest.raises(ValueError):
target[mask] = other[mask]

@pytest.mark.parametrize('other', [
pd.Categorical(['b', 'a']),
pd.Categorical(['b', 'a'], categories=['b', 'a'], ordered=True),
pd.Categorical(['b', 'a'], categories=['a', 'b', 'c'], ordered=True),
])
def test_setitem_same_ordered_rasies(self, other):
# Gh-24142
target = pd.Categorical(['a', 'b'], categories=['a', 'b'],
ordered=True)
mask = np.array([True, False])

with pytest.raises(ValueError):
target[mask] = other[mask]


class TestCategoricalIndexing(object):

Expand Down Expand Up @@ -122,37 +162,59 @@ def test_get_indexer_non_unique(self, idx_values, key_values, key_class):
tm.assert_numpy_array_equal(expected, result)
tm.assert_numpy_array_equal(exp_miss, res_miss)

def test_where_unobserved_nan(self):
ser = pd.Series(pd.Categorical(['a', 'b']))
result = ser.where([True, False])
expected = pd.Series(pd.Categorical(['a', None],
categories=['a', 'b']))
tm.assert_series_equal(result, expected)

# all NA
ser = pd.Series(pd.Categorical(['a', 'b']))
result = ser.where([False, False])
expected = pd.Series(pd.Categorical([None, None],
categories=['a', 'b']))
tm.assert_series_equal(result, expected)

def test_where_unobserved_categories(self):
arr = Categorical(['a', 'b', 'c'], categories=['d', 'c', 'b', 'a'])
result = arr.where([True, True, False], other='b')
expected = Categorical(['a', 'b', 'b'], categories=arr.categories)
tm.assert_categorical_equal(result, expected)
ser = pd.Series(
Categorical(['a', 'b', 'c'], categories=['d', 'c', 'b', 'a'])
)
result = ser.where([True, True, False], other='b')
expected = pd.Series(
Categorical(['a', 'b', 'b'], categories=ser.cat.categories)
)
tm.assert_series_equal(result, expected)

def test_where_other_categorical(self):
arr = Categorical(['a', 'b', 'c'], categories=['d', 'c', 'b', 'a'])
ser = pd.Series(
Categorical(['a', 'b', 'c'], categories=['d', 'c', 'b', 'a'])
)
other = Categorical(['b', 'c', 'a'], categories=['a', 'c', 'b', 'd'])
result = arr.where([True, False, True], other)
expected = Categorical(['a', 'c', 'c'], dtype=arr.dtype)
tm.assert_categorical_equal(result, expected)
result = ser.where([True, False, True], other)
expected = pd.Series(Categorical(['a', 'c', 'c'], dtype=ser.dtype))
tm.assert_series_equal(result, expected)

def test_where_warns(self):
arr = Categorical(['a', 'b', 'c'])
ser = pd.Series(Categorical(['a', 'b', 'c']))
with tm.assert_produces_warning(FutureWarning):
result = arr.where([True, False, True], 'd')
result = ser.where([True, False, True], 'd')

expected = np.array(['a', 'd', 'c'], dtype='object')
tm.assert_numpy_array_equal(result, expected)
expected = pd.Series(np.array(['a', 'd', 'c'], dtype='object'))
tm.assert_series_equal(result, expected)

def test_where_ordered_differs_rasies(self):
arr = Categorical(['a', 'b', 'c'], categories=['d', 'c', 'b', 'a'],
ordered=True)
ser = pd.Series(
Categorical(['a', 'b', 'c'], categories=['d', 'c', 'b', 'a'],
ordered=True)
)
other = Categorical(['b', 'c', 'a'], categories=['a', 'c', 'b', 'd'],
ordered=True)
with tm.assert_produces_warning(FutureWarning):
result = arr.where([True, False, True], other)
result = ser.where([True, False, True], other)

expected = np.array(['a', 'c', 'c'], dtype=object)
tm.assert_numpy_array_equal(result, expected)
expected = pd.Series(np.array(['a', 'c', 'c'], dtype=object))
tm.assert_series_equal(result, expected)


@pytest.mark.parametrize("index", [True, False])
Expand Down
8 changes: 5 additions & 3 deletions pandas/tests/arrays/interval/test_interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import numpy as np
import pytest

import pandas as pd
from pandas import Index, Interval, IntervalIndex, date_range, timedelta_range
from pandas.core.arrays import IntervalArray
import pandas.util.testing as tm
Expand Down Expand Up @@ -55,10 +56,11 @@ def test_set_closed(self, closed, new_closed):
IntervalArray.from_breaks([1, 2, 3, 4], closed='right'),
])
def test_where_raises(self, other):
arr = IntervalArray.from_breaks([1, 2, 3, 4], closed='left')
match = "'other.closed' is 'right', expected 'left'."
ser = pd.Series(IntervalArray.from_breaks([1, 2, 3, 4],
closed='left'))
match = "'value.closed' is 'right', expected 'left'."
with pytest.raises(ValueError, match=match):
arr.where([True, False, True], other=other)
ser.where([True, False, True], other=other)


class TestSetitem(object):
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/arrays/test_period.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ def test_sub_period():
period_array(['2000', '2001', '2000'], freq='H')
])
def test_where_different_freq_raises(other):
arr = period_array(['2000', '2001', '2002'], freq='D')
ser = pd.Series(period_array(['2000', '2001', '2002'], freq='D'))
cond = np.array([True, False, True])
with pytest.raises(IncompatibleFrequency,
match="Input has different freq=H"):
arr.where(cond, other)
ser.where(cond, other)


# ----------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/extension/test_sparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def make_data(fill_value):
if np.isnan(fill_value):
data = np.random.uniform(size=100).astype('float64')
else:
data = np.random.randint(1, 100, size=100, dtype='int64')
data = np.random.randint(1, 100, size=100)
if data[0] == data[1]:
data[0] += 1

Expand Down Expand Up @@ -266,13 +266,13 @@ def test_where_series(self, data, na_value):

cond = np.array([True, True, False, False])
result = ser.where(cond)
# new_dtype is the only difference

new_dtype = SparseDtype('float', 0.0)
expected = pd.Series(cls._from_sequence([a, a, na_value, na_value],
dtype=new_dtype))
self.assert_series_equal(result, expected)

other = cls._from_sequence([a, b, a, b])
other = cls._from_sequence([a, b, a, b], dtype=data.dtype)
cond = np.array([True, False, True, True])
result = ser.where(cond, other)
expected = pd.Series(cls._from_sequence([a, b, b, b],
Expand Down