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 8ec2fd0 ARROW-5564: [C++] Use uriparser from conda-forge 8ec2fd0 is described below commit 8ec2fd0d7dc686228e488dc7a56815c1ffd97c66 Author: Antoine Pitrou <anto...@python.org> AuthorDate: Mon Jul 1 17:39:07 2019 -0500 ARROW-5564: [C++] Use uriparser from conda-forge Author: Antoine Pitrou <anto...@python.org> Closes #4767 from pitrou/ARROW-5564-conda-uriparser and squashes the following commits: 3c422c947 <Antoine Pitrou> ARROW-5564: Use uriparser from conda-forge --- ci/conda_env_cpp.yml | 1 + cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ---- dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/conda_env_cpp.yml b/ci/conda_env_cpp.yml index e34d2bf..fd21ed8 100644 --- a/ci/conda_env_cpp.yml +++ b/ci/conda_env_cpp.yml @@ -36,5 +36,6 @@ python rapidjson snappy thrift-cpp>=0.11.0 +uriparser zlib zstd diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index f6677e0..b913123 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -94,10 +94,6 @@ if(ARROW_DEPENDENCY_SOURCE STREQUAL "CONDA") endif() set(ARROW_ACTUAL_DEPENDENCY_SOURCE "SYSTEM") message(STATUS "Using CONDA_PREFIX for ARROW_PACKAGE_PREFIX: ${ARROW_PACKAGE_PREFIX}") - # ARROW-5564: Remove this when uriparser gets a conda package - if("${uriparser_SOURCE}" STREQUAL "") - set(uriparser_SOURCE "AUTO") - endif() else() set(ARROW_ACTUAL_DEPENDENCY_SOURCE "${ARROW_DEPENDENCY_SOURCE}") endif() diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml index 3fd43f3..4638980 100644 --- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml +++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml @@ -39,6 +39,7 @@ requirements: - re2 - snappy - thrift-cpp >=0.11 + - uriparser - zlib - zstd @@ -55,6 +56,7 @@ requirements: - python - re2 - snappy + - uriparser - zlib - zstd