Repository: arrow Updated Branches: refs/heads/master 62a17b7e8 -> 0eec40aa5
ARROW-1046: [Python] Reconcile pandas metadata spec Author: Wes McKinney <wes.mckin...@twosigma.com> Closes #701 from wesm/reconcile-pandas-metadata and squashes the following commits: f08d3ca3 [Wes McKinney] The pandas spec is numpy_type instead of numpy_dtype Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/0eec40aa Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/0eec40aa Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/0eec40aa Branch: refs/heads/master Commit: 0eec40aa5d4ea955b45bd934899e178530fd9dc9 Parents: 62a17b7 Author: Wes McKinney <wes.mckin...@twosigma.com> Authored: Wed May 17 15:36:04 2017 -0400 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Wed May 17 15:36:04 2017 -0400 ---------------------------------------------------------------------- python/pyarrow/pandas_compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/0eec40aa/python/pyarrow/pandas_compat.py ---------------------------------------------------------------------- diff --git a/python/pyarrow/pandas_compat.py b/python/pyarrow/pandas_compat.py index 2f72d6a..255b31a 100644 --- a/python/pyarrow/pandas_compat.py +++ b/python/pyarrow/pandas_compat.py @@ -70,7 +70,7 @@ def get_column_metadata(column, name): 'integer': str(dtype), 'floating': str(dtype), }.get(inferred_dtype, inferred_dtype), - 'numpy_dtype': str(dtype), + 'numpy_type': str(dtype), 'metadata': extra_metadata, }
