Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6aa72ca
ENH: Add engine keyword to read_json to enable reading from pyarrow #…
Dec 13, 2022
c248b84
moved argument to the end of signature, fixed elifs
Jan 20, 2023
91b81cf
Adding finally
Jan 20, 2023
9020663
Updated the _make_engine try-finally block
Jan 25, 2023
0388c4e
Fixing merge conflicts
Dec 13, 2022
6911791
Merge branch 'main' into main
Jan 26, 2023
5ecd3e0
Merge branch 'pandas-dev:main' into main
Jan 27, 2023
c660395
Refactored pyarrow engine code
Dec 13, 2022
54570ca
Merge branch 'pandas-dev:main' into main
Jan 29, 2023
eb709e7
Refactored pyarrow implementation to inline
Dec 13, 2022
0a9c841
Merge branch 'pandas-dev:main' into main
Feb 1, 2023
7eccd83
Small refactors
Feb 1, 2023
986d8cb
Merge branch 'pandas-dev:main' into main
Feb 1, 2023
b4409bb
Fixing double lines
Feb 1, 2023
0467fe8
Merge branch 'pandas-dev:main' into main
Feb 1, 2023
569ab9b
Merge branch 'pandas-dev:main' into main
Feb 1, 2023
4dc9adc
Merge branch 'pandas-dev:main' into main
Feb 2, 2023
38bc7db
- Added the logic for skipping test if pyarrow is not installed.
Feb 2, 2023
bed15df
Added else statement to conftest engine
Feb 2, 2023
a29e96a
Merge branch 'main' into main
Feb 2, 2023
cdfd747
- removed xfail decorators
Feb 2, 2023
c70c0b4
Merge branch 'main' into test-fixes
Feb 2, 2023
fe2b3ef
Merge branch 'main' into main
Feb 3, 2023
228ca64
Merge branch 'main' into main
Feb 3, 2023
d1acc94
Merge branch 'pandas-dev:main' into main
Feb 4, 2023
0885f07
Merge remote-tracking branch 'upstream/main' into abkosar/main
mroeschke Feb 9, 2023
ab7af44
add whatsnew, address comments
mroeschke Feb 9, 2023
c9cde9e
Merge remote-tracking branch 'upstream/main' into abkosar/main
mroeschke Feb 9, 2023
8c96553
address review
mroeschke Feb 9, 2023
9cbf598
Add note about param
mroeschke Feb 9, 2023
c59310b
Add test with lines=false
mroeschke Feb 10, 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 abkosar/main
  • Loading branch information
mroeschke committed Feb 9, 2023
commit c9cde9ef7a0a34bae7302cad7f68b3d1cf4bc529

This merge commit was added into this branch cleanly.

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