You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/09/01 18:18:22 UTC
[arrow] branch master updated: ARROW-3153: [Packaging] Fix broken
nightly package builds introduced with recent cmake changes and orc tests
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 20c0405 ARROW-3153: [Packaging] Fix broken nightly package builds introduced with recent cmake changes and orc tests
20c0405 is described below
commit 20c04051d1ad54121b28b1704aa49f3ae4b6e1d5
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Sat Sep 1 14:18:13 2018 -0400
ARROW-3153: [Packaging] Fix broken nightly package builds introduced with recent cmake changes and orc tests
Don't merge yet, currently running the packaging tasks.
- [x] passing [conda builds](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-303)
- [x] passing [wheel builds](https://github.com/kszucs/crossbow/branches/all?utf8=%E2%9C%93&query=build-304)
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #2502 from kszucs/ARROW-3153 and squashes the following commits:
a5869287 <Krisztián Szűcs> flake8
b00cb97d <Krisztián Szűcs> update pandas test dependency in wheel builds; minor orc test cleanup
c9d59991 <Krisztián Szűcs> add libprotobuf dependency
---
dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 1 +
dev/tasks/tasks.yml | 6 +++---
python/pyarrow/tests/test_orc.py | 32 +++++++----------------------
3 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index 6439ee3..07044af 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -37,6 +37,7 @@ requirements:
- {{ compiler('cxx') }}
host:
- boost-cpp
+ - libprotobuf
- flatbuffers
- rapidjson
- zlib
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 20ac0b9..50e79c0 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -175,7 +175,7 @@ tasks:
params:
numpy_build_version: 1.10.4
numpy_test_version: 1.14.0
- pandas_version: 0.20.3
+ pandas_version: 0.23.0
python_version: 2.7
artifacts:
- pyarrow-{version}-cp27-cp27m-macosx_10_6_intel.whl
@@ -186,7 +186,7 @@ tasks:
params:
numpy_build_version: 1.10.4
numpy_test_version: 1.14.0
- pandas_version: 0.20.3
+ pandas_version: 0.23.0
python_version: 3.5
artifacts:
- pyarrow-{version}-cp35-cp35m-macosx_10_6_intel.whl
@@ -197,7 +197,7 @@ tasks:
params:
numpy_build_version: 1.11.3
numpy_test_version: 1.14.0
- pandas_version: 0.20.3
+ pandas_version: 0.23.0
python_version: 3.6
artifacts:
- pyarrow-{version}-cp36-cp36m-macosx_10_6_intel.whl
diff --git a/python/pyarrow/tests/test_orc.py b/python/pyarrow/tests/test_orc.py
index 3e51777..e2fcc93 100644
--- a/python/pyarrow/tests/test_orc.py
+++ b/python/pyarrow/tests/test_orc.py
@@ -17,7 +17,6 @@
import datetime
import decimal
-import gzip
import os
from pandas.util.testing import assert_frame_equal
@@ -120,7 +119,12 @@ def check_example_file(orc_path, expected_df, need_fix=False):
assert json_pos == orc_file.nrows
-def check_example_using_json(example_name):
+@pytest.mark.parametrize('example_name', [
+ 'TestOrcFile.test1',
+ 'TestOrcFile.testDate1900',
+ 'decimal'
+])
+def test_example_using_json(example_name):
"""
Check a ORC file example against the equivalent JSON file, as given
in the Apache ORC repository (the JSON file has one JSON object per
@@ -128,12 +132,7 @@ def check_example_using_json(example_name):
"""
# Read JSON file
json_path = path_for_json_example(example_name)
- if json_path.endswith('.gz'):
- f = gzip.open(json_path, 'r')
- else:
- f = open(json_path, 'r')
-
- table = pd.read_json(f, lines=True)
+ table = pd.read_json(json_path, lines=True)
check_example_file(path_for_orc_example(example_name), table,
need_fix=True)
@@ -174,20 +173,3 @@ def test_orcfile_empty():
]))),
])
assert schema == expected_schema
-
-
-def test_orcfile_test1_json():
- # Exercise the JSON test path
- check_example_using_json('TestOrcFile.test1')
-
-
-def test_orcfile_test1_pickle():
- check_example_using_json('TestOrcFile.test1')
-
-
-def test_orcfile_dates():
- check_example_using_json('TestOrcFile.testDate1900')
-
-
-def test_orcfile_decimals():
- check_example_using_json('decimal')