Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Copy Markdown
Member

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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff 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: http://github.com/apache/arrow
Expand Down
3 changes: 3 additions & 0 deletions python/pyarrow/tests/test_flight.py
Original file line numberDiff line numberDiff 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