Skip to content

ARROW-5511: [Packaging] Enable Flight in Conda packages #4473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 9 commits into from
Closed

ARROW-5511: [Packaging] Enable Flight in Conda packages #4473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9c4cd6
Enable Flight in Conda packages
lidavidm Jun 4, 2019
d809fdf
bundle uriparser
kszucs Jun 26, 2019
8765af1
pass ARROW_TEST_DATA
kszucs Jun 26, 2019
f612508
export ARROW_TEST_DATA on the template level
kszucs Jun 27, 2019
e764a59
use SRC_DIR
kszucs Jun 27, 2019
c0b95ac
debug env vars
kszucs Jun 27, 2019
c1baa4c
skip tests instead
kszucs Jun 27, 2019
55d2f41
Build Flight in Windows conda packages [skip ci]
wesm Jun 27, 2019
909b798
Also build uriparser bundled in windows [skip ci]
wesm Jun 27, 2019
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
1 change: 1 addition & 0 deletions dev/tasks/conda-recipes/appveyor.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ test_script:
- git clone --no-checkout {{ arrow.remote }} arrow || exit /B
- git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }} || exit /B
- git -C arrow checkout FETCH_HEAD || exit /B
- git -C arrow submodule update --init --recursive || exit /B

- pushd arrow\dev\tasks\conda-recipes

Expand Down
2 changes: 2 additions & 0 deletions dev/tasks/conda-recipes/arrow-cpp/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ cmake -G "%CMAKE_GENERATOR%" ^
-DARROW_BUILD_TESTS:BOOL=OFF ^
-DARROW_BUILD_UTILITIES:BOOL=OFF ^
-DCMAKE_BUILD_TYPE=release ^
-DARROW_FLIGHT:BOOL=ON ^
-DARROW_PYTHON:BOOL=ON ^
-DARROW_PARQUET:BOOL=ON ^
-DARROW_GANDIVA:BOOL=ON ^
-DARROW_ORC:BOOL=ON ^
-Duriparser_SOURCE=BUNDLED ^
..

cmake --build . --target INSTALL --config Release
Expand Down
2 changes: 2 additions & 0 deletions dev/tasks/conda-recipes/arrow-cpp/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ cmake \
-DCMAKE_INSTALL_LIBDIR=$PREFIX/lib \
-DLLVM_TOOLS_BINARY_DIR=$PREFIX/bin \
-DARROW_DEPENDENCY_SOURCE=SYSTEM \
-Duriparser_SOURCE=BUNDLED \
Copy link
Member

@xhochy xhochy Jun 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that we need to package uriparser before we can release this on conda-forge; there bundling of thirdparties is not really accepted.

Copy link
Member

@kszucs kszucs Jun 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the update, didn't know that.

Copy link
Member

@pitrou pitrou Jun 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even for small private dependencies?

Copy link
Member

@wesm wesm Jun 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can temporarily statically-link uriparser, we had a bunch of stuff statically linked on conda-forge for a long time before the CMake refactor

-DARROW_PACKAGE_PREFIX=$PREFIX \
-DARROW_BOOST_USE_SHARED=ON \
-DARROW_BUILD_BENCHMARKS=OFF \
-DARROW_BUILD_UTILITIES=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_JEMALLOC=ON \
-DARROW_FLIGHT=ON \
-DARROW_PLASMA=ON \
-DARROW_PYTHON=ON \
-DARROW_PARQUET=ON \
Expand Down
9 changes: 9 additions & 0 deletions dev/tasks/conda-recipes/arrow-cpp/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ requirements:
host:
- boost-cpp
- brotli
- c-ares
- double-conversion
- flatbuffers
- gflags
- glog
- grpc-cpp
- libprotobuf
- clangdev 7.*
- llvmdev 7.*
Expand All @@ -44,9 +46,11 @@ requirements:
- {{ pin_compatible('numpy', lower_bound='1.14') }}
- boost-cpp
- brotli
- c-ares
- double-conversion
- gflags
- glog
- grpc-cpp
- lz4-c
- python
- re2
Expand All @@ -58,6 +62,7 @@ test:
commands:
# headers
- test -f $PREFIX/include/arrow/api.h # [unix]
- test -f $PREFIX/include/arrow/flight/types.h # [unix]
- test -f $PREFIX/include/plasma/client.h # [unix]
- test -f $PREFIX/include/gandiva/engine.h # [unix]
- test -f $PREFIX/include/parquet/api/reader.h # [unix]
Expand All @@ -67,17 +72,20 @@ test:

# static
- test -f $PREFIX/lib/libarrow.a # [unix]
- test -f $PREFIX/lib/libarrow_flight.a # [unix]
- test -f $PREFIX/lib/libarrow_python.a # [unix]
- test -f $PREFIX/lib/libplasma.a # [unix]
- test -f $PREFIX/lib/libparquet.a # [unix]
- test -f $PREFIX/lib/libgandiva.a # [unix]
- if not exist %PREFIX%\\Library\\lib\\arrow_static.lib exit 1 # [win]
- if not exist %PREFIX%\\Library\\lib\\arrow_flight_static.lib exit 1 # [win]
- if not exist %PREFIX%\\Library\\lib\\arrow_python_static.lib exit 1 # [win]
- if not exist %PREFIX%\\Library\\lib\\parquet_static.lib exit 1 # [win]
- if not exist %PREFIX%\\Library\\lib\\gandiva_static.lib exit 1 # [win]

# shared
- test -f $PREFIX/lib/libarrow.so # [linux]
- test -f $PREFIX/lib/libarrow_flight.so # [linux]
- test -f $PREFIX/lib/libarrow_python.so # [linux]
- test -f $PREFIX/lib/libparquet.so # [linux]
- test -f $PREFIX/lib/libgandiva.so # [linux]
Expand All @@ -88,6 +96,7 @@ test:
- test -f $PREFIX/lib/libparquet.dylib # [osx]
- test -f $PREFIX/lib/libplasma.dylib # [osx]
- if not exist %PREFIX%\\Library\\bin\\arrow.dll exit 1 # [win]
- if not exist %PREFIX%\\Library\\bin\\arrow_flight.dll exit 1 # [win]
- if not exist %PREFIX%\\Library\\bin\\arrow_python.dll exit 1 # [win]
- if not exist %PREFIX%\\Library\\bin\\parquet.dll exit 1 # [win]
- if not exist %PREFIX%\\Library\\bin\\gandiva.dll exit 1 # [win]
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/conda-recipes/azure.linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
git clone --no-checkout {{ arrow.remote }} arrow
git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
git -C arrow checkout FETCH_HEAD
git -C arrow submodule update --init --recursive
displayName: Clone arrow

- script: CI=azure ./run_docker_build.sh
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/conda-recipes/azure.osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
git clone --no-checkout {{ arrow.remote }} arrow
git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
git -C arrow checkout FETCH_HEAD
git -C arrow submodule update --init --recursive
displayName: Clone arrow

- script: |
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/conda-recipes/azure.win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
git clone --no-checkout {{ arrow.remote }} arrow
git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
git -C arrow checkout FETCH_HEAD
git -C arrow submodule update --init --recursive
displayName: Clone arrow

# Configure the VM
Expand Down
5 changes: 3 additions & 2 deletions dev/tasks/conda-recipes/pyarrow/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ copy /Y "%SRC_DIR%\cpp\cmake_modules\FindPythonLibsNew.cmake" cmake_modules\

SET ARROW_HOME=%LIBRARY_PREFIX%
SET SETUPTOOLS_SCM_PRETEND_VERSION=%PKG_VERSION%
SET PYARROW_WITH_FLIGHT=1
SET PYARROW_WITH_GANDIVA=1
SET PYARROW_WITH_PARQUET=1
"%PYTHON%" setup.py ^
build_ext --build-type=release ^
--with-parquet ^
--with-gandiva ^
install --single-version-externally-managed ^
--record=record.txt
if errorlevel 1 exit 1
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/conda-recipes/pyarrow/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ cd python

$PYTHON setup.py \
build_ext --build-type=release \
--with-flight \
--with-orc \
--with-plasma \
--with-parquet \
Expand Down
3 changes: 2 additions & 1 deletion dev/tasks/conda-recipes/pyarrow/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ requirements:
test:
imports:
- pyarrow
- pyarrow.flight # [py>=35]
- pyarrow.plasma # [unix]
- pyarrow.parquet
- pyarrow.gandiva # [py>=35]
Expand All @@ -54,7 +55,7 @@ test:
- hypothesis

commands:
- pytest --pyargs pyarrow
- pytest -m "not requires_testing_data" --pyargs pyarrow

about:
home: https://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ def test_location_invalid():


@pytest.mark.slow
@pytest.mark.requires_testing_data
def test_tls_fails():
"""Make sure clients cannot connect when cert verification fails."""
certs = example_tls_certs()
Expand All @@ -635,6 +636,7 @@ def test_tls_fails():
client.do_get(flight.Ticket(b'ints'))


@pytest.mark.requires_testing_data
def test_tls_do_get():
"""Try a simple do_get call over TLS."""
table = simple_ints_table()
Expand All @@ -650,6 +652,7 @@ def test_tls_do_get():
assert data.equals(table)


@pytest.mark.requires_testing_data
def test_tls_override_hostname():
"""Check that incorrectly overriding the hostname fails."""
certs = example_tls_certs()
Expand Down