Skip to content

ENH: implement timeszones support for read_json(orient='table') and astype() from 'object' #35973

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 37 commits into from
Nov 4, 2020
Merged

ENH: implement timeszones support for read_json(orient='table') and astype() from 'object' #35973

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f1d7f59
ENH: implement timeszones support for DataFrame.to_json(orient='table')
attack68 Aug 29, 2020
eeb6201
pep8
attack68 Aug 29, 2020
95b9501
minor cleanup
attack68 Aug 29, 2020
c057358
linting and type cleanup
attack68 Aug 29, 2020
70b1448
isort
attack68 Aug 29, 2020
e762ce0
static type ignore
attack68 Aug 29, 2020
61ca6a8
black and mypy fix to work together
attack68 Aug 29, 2020
f9d071a
re-write so conversion occurs in astype() as opposed to parse_json()
attack68 Aug 31, 2020
79bd2eb
removed unused imports
attack68 Aug 31, 2020
f9f413f
black fix
attack68 Aug 31, 2020
ce51e30
typing
attack68 Sep 1, 2020
37cad4f
astype conversion for objects of one tz to another tz
attack68 Sep 1, 2020
39740d8
linting isort
attack68 Sep 1, 2020
d1a9cd3
move tests
attack68 Sep 2, 2020
bb8f7b9
move tests
attack68 Sep 2, 2020
b55cced
seg fault failure fix?
attack68 Sep 13, 2020
5bc4b2c
remove raise condition
attack68 Sep 16, 2020
a6c7ec6
eliminate try-except and move tests
attack68 Sep 16, 2020
a192c66
black fix
attack68 Sep 16, 2020
6d98945
issues stamp
attack68 Sep 16, 2020
b4ac6aa
linting
attack68 Sep 16, 2020
a502a04
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Sep 17, 2020
f06a9e0
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Sep 19, 2020
5a07736
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Sep 21, 2020
bae0a30
test common terms
attack68 Sep 26, 2020
2f36826
test common terms
attack68 Sep 26, 2020
4ebe5b3
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Sep 28, 2020
0f7cedd
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Sep 29, 2020
54da03f
uncomment previous test now working.
attack68 Sep 29, 2020
4fe7f41
double quotes error
attack68 Sep 30, 2020
f0fe4e4
restart tests
attack68 Oct 1, 2020
8a82832
restart tests
attack68 Oct 1, 2020
978b4a3
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Oct 9, 2020
d44a267
fix whats new comments
attack68 Oct 9, 2020
4a1fc86
rephrased test
attack68 Oct 9, 2020
a6e8681
Merge remote-tracking branch 'upstream/master' into enh_timezones_json
attack68 Oct 19, 2020
6b58d2f
Merge branch 'master' into enh_timezones_json
jreback 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
seg fault failure fix?
  • Loading branch information
@attack68
attack68 committed Sep 16, 2020
commit b55ccedb6812893afcf6728f76e23572f8d10c6d
3 changes: 2 additions & 1 deletion pandas/tests/io/json/test_json_table_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,8 @@ def test_read_json_table_orient_raises(self, index_nm, vals, recwarn):
},
],
)
def test_read_json_table_timezones_orient(self, idx, vals):
@pytest.mark.skipif(sys.version_info[:3] == (3, 7, 0), reason="GH-35309")
def test_read_json_table_timezones_orient(self, idx, vals, recwarn):
df = DataFrame(vals, index=idx)
out = df.to_json(orient="table")
result = pd.read_json(out, orient="table")
Expand Down