Skip to content

BUG: fix AttributeError raised with pd.concat between a None and timezone-aware Timestamp #54428

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 22 commits into from
Oct 23, 2023
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d75762d
BUG: NaT instead of error for timestamp
srkds May 2, 2023
e17bd97
Merge remote-tracking branch 'upstream/main' into bug/52093/concat_no…
srkds May 3, 2023
8804de4
Merge remote-tracking branch 'upstream/main' into bug/52093/concat_no…
srkds May 8, 2023
c1c5675
Timestamp
srkds May 8, 2023
634e522
Merge remote-tracking branch 'upstream/main' into bug/52093/concat_no…
srkds May 9, 2023
4171a7c
whatsnew entry
srkds May 9, 2023
11db8f1
Resolved merge conflict: accepted both changes
srkds Jun 26, 2023
416f4a8
added actual bug test case
srkds Jun 26, 2023
8363a47
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Aug 5, 2023
71788fd
Update test
yuanx749 Aug 5, 2023
b902ade
Update whatsnew
yuanx749 Aug 6, 2023
f3ddec2
Add unit
yuanx749 Aug 10, 2023
2c9e3f5
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Aug 10, 2023
57dfdc5
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Aug 16, 2023
dc073e9
Update
yuanx749 Aug 21, 2023
d13d27c
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Aug 21, 2023
7f3d494
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Aug 28, 2023
287bee1
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Sep 10, 2023
4b5e247
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Oct 11, 2023
b9e4c8b
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Oct 23, 2023
4e76bbb
Merge remote-tracking branch 'upstream/main' into concat-none-dt
yuanx749 Oct 23, 2023
e5ae627
Move whatsnew
yuanx749 Oct 23, 2023
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/main' into concat-none-dt
  • Loading branch information
yuanx749 committed Aug 21, 2023
commit d13d27c6f2162e13b905d1e5dfdfec4483b85bea

This merge commit was added into this branch cleanly.

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