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 bbf2e0f ARROW-2929: [C++] ARROW-2826 Breaks parquet-cpp 1.4.0 builds
bbf2e0f is described below
commit bbf2e0fcf241afe6b7ad1db42dd5a3fa587834c3
Author: Phillip Cloud <[email protected]>
AuthorDate: Sun Jul 29 12:31:36 2018 -0400
ARROW-2929: [C++] ARROW-2826 Breaks parquet-cpp 1.4.0 builds
This uses parquet-cpp master when building windows wheels and conda
packages on all platforms
Author: Phillip Cloud <[email protected]>
Closes #2337 from cpcloud/ARROW-2929 and squashes the following commits:
b3b0c2c5 <Phillip Cloud> Encrypt in the UI
89c4571b <Phillip Cloud> Do not set boost root when building wheels
feb7d86a <Phillip Cloud> Set for conda as well
4b1b2551 <Phillip Cloud> Use secure token
d7c69f4e <Phillip Cloud> ARROW-2929: ARROW-2826 Breaks parquet-cpp 1.4.0
builds
---
dev/tasks/conda-recipes/parquet-cpp/meta.yaml | 10 ++++------
dev/tasks/conda-recipes/pyarrow/meta.yaml | 4 ++--
dev/tasks/python-wheels/appveyor.yml | 4 +---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
b/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
index 2b76a01..9a9b598 100644
--- a/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/parquet-cpp/meta.yaml
@@ -15,9 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-{% set version = "1.4.0" %}
-{% set commit = "b62c22e52d37fa9580d85c5a2a2d73bd8e268364" %}
-{% set sha256sum =
"2fa5704fc1164f68508e3050d30a6436dd56434e1a592d8ddf4afd68f62a7c01" %}
+{% set version = "1.4.0.post0" %}
+{% set commit = "master" %}
# NOTE(wesm): When updating the build, please remember also to update the
# pinned Arrow version. We are letting parquet-cpp build its own Apache Arrow
@@ -30,12 +29,11 @@ package:
version: {{ version }}
source:
- fn: apache-parquet-cpp-{{ version }}.tar.gz
+ fn: {{ commit }}.tar.gz
url: https://github.com/apache/parquet-cpp/archive/{{ commit }}.tar.gz
- sha256: {{ sha256sum }}
build:
- number: 2
+ number: 0
skip: true # [win32]
skip: true # [win and py<35]
diff --git a/dev/tasks/conda-recipes/pyarrow/meta.yaml
b/dev/tasks/conda-recipes/pyarrow/meta.yaml
index c766903..24ba584 100644
--- a/dev/tasks/conda-recipes/pyarrow/meta.yaml
+++ b/dev/tasks/conda-recipes/pyarrow/meta.yaml
@@ -41,7 +41,7 @@ requirements:
- numpy 1.12.* # [win and py>=36]
- six
- arrow-cpp {{ ARROW_VERSION }}
- - parquet-cpp 1.4.0
+ - parquet-cpp 1.4.0.post0
run:
- python
@@ -51,7 +51,7 @@ requirements:
- pandas
- six
- arrow-cpp {{ ARROW_VERSION }}
- - parquet-cpp 1.4.0
+ - parquet-cpp 1.4.0.post0
- futures # [py27]
test:
diff --git a/dev/tasks/python-wheels/appveyor.yml
b/dev/tasks/python-wheels/appveyor.yml
index fda0609..d9d208c 100644
--- a/dev/tasks/python-wheels/appveyor.yml
+++ b/dev/tasks/python-wheels/appveyor.yml
@@ -23,12 +23,10 @@ environment:
NUMPY: "{{ numpy_version }}"
PYTHON: "{{ python_version }}"
MSVC_DEFAULT_OPTIONS: ON
- BOOST_ROOT: C:\Libraries\boost_1_63_0
- BOOST_LIBRARYDIR: C:\Libraries\boost_1_63_0\lib64-msvc-14.0
ARROW_SRC: C:\apache-arrow
PYARROW_VERSION: {{ arrow.version }}
PYARROW_REF: {{ arrow.head }}
- PARQUET_CPP_REF: apache-parquet-cpp-1.4.0
+ PARQUET_CPP_REF: master
init:
- set MINICONDA=C:\Miniconda35-x64
