Fix typo + print out conda env in conda docker builds

This commit is contained in:
Antoine Pitrou committed 2019-12-18 11:53:06 +01:00
1 parent 5f3650f909
commit 7d0b864bfc
3 files changed
+9 -1

No files matched your search

+3
View File
@@ -27,6 +27,9 @@ with_docs=${3:-false}
# TODO(kszucs): consider to move these to CMake
if [ ! -z "${CONDA_PREFIX}" ]; then
echo -e "===\n=== Conda environment for build\n==="
conda list
export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_AR=${AR} -DCMAKE_RANLIB=${RANLIB}"
export ARROW_GANDIVA_PC_CXX_FLAGS=$(echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 | grep '^ ' | awk '{print "-isystem;" substr($1, 1)}' | tr '\n' ';')
elif [ -x "$(command -v xcrun)" ]; then
+5
View File
@@ -22,6 +22,11 @@ set -ex
source_dir=${1}/python
build_dir=${2}/python
if [ ! -z "${CONDA_PREFIX}" ]; then
echo -e "===\n=== Conda environment for build\n==="
conda list
fi
export PYARROW_CMAKE_GENERATOR=${CMAKE_GENERATOR:-Ninja}
export PYARROW_BUILD_TYPE=${CMAKE_BUILD_TYPE:-debug}
export PYARROW_WITH_S3=${ARROW_S3:-OFF}
+1 -1
View File
@@ -1404,7 +1404,7 @@ cdef class LargeListArray(Array):
def flatten(self, MemoryPool memory_pool=None):
"""
Unnest this ListArray by one level.
Unnest this LargeListArray by one level.
The returned Array is logically a concatenation of all the sub-lists
in this Array.