[arrow] branch master updated: ARROW-3925: [Python] Add autoconf to conda install instructions

[we...@apache.org]

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 bfedd3a  ARROW-3925: [Python] Add autoconf to conda install instructions
bfedd3a is described below

commit bfedd3af2dadb7bda1348a795b04705d28cefa8f
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Sat Dec 1 22:25:09 2018 -0600

    ARROW-3925: [Python] Add autoconf to conda install instructions
    
    autoconf is required by the jemalloc build
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    Author: fjetter <fj...@users.noreply.github.com>
    Author: Wes McKinney <we...@apache.org>
    
    Closes #2836 from fjetter/patch-1 and squashes the following commits:
    
    9fba4ebfa <Wes McKinney> Create conda_env_unix.yml and use that in the Python documentation
    dcbff0ffc <Krisztián Szűcs> don't escape within code-block
    cfe3d3fab <Krisztián Szűcs> move autoconf to conda_env_cpp; update development documentation
    7414fad1b <fjetter> Add glog to conda install instruction
    768303ff3 <fjetter> Add autoconf to conda install instructions
---
 cpp/Dockerfile => ci/conda_env_unix.yml | 36 ++-------------------------------
 cpp/Dockerfile                          |  5 ++---
 python/doc/source/development.rst       | 21 ++++++++++++++-----
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/cpp/Dockerfile b/ci/conda_env_unix.yml
similarity index 50%
copy from cpp/Dockerfile
copy to ci/conda_env_unix.yml
index 4ec8f0f..eeb90e4 100644
--- a/cpp/Dockerfile
+++ b/ci/conda_env_unix.yml
@@ -15,38 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM ubuntu:18.04
+# conda package dependencies specific to Unix-like environments (Linux and macOS)
 
-# install build essentials
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-      autoconf \
-      automake \
-      ca-certificates \
-      ccache \
-      g++ \
-      gcc \
-      git \
-      ninja-build \
-      pkg-config \
-      wget
-
-# install conda and required packages
-ENV PATH=/opt/conda/bin:$PATH \
-    CONDA_PREFIX=/opt/conda
-ADD ci/docker_install_conda.sh \
-    ci/conda_env_cpp.yml \
-    /arrow/ci/
-RUN arrow/ci/docker_install_conda.sh && \
-    conda install -c conda-forge \
-        --file arrow/ci/conda_env_cpp.yml && \
-    conda clean --all
-
-ENV CC=gcc \
-    CXX=g++ \
-    ARROW_BUILD_TESTS=ON
-
-# build and test
-CMD arrow/ci/docker_build_cpp.sh && \
-    cd /build/cpp && \
-    ctest -j2 --output-on-failure -L unittest
+autoconf
diff --git a/cpp/Dockerfile b/cpp/Dockerfile
index 4ec8f0f..4524bac 100644
--- a/cpp/Dockerfile
+++ b/cpp/Dockerfile
@@ -20,8 +20,6 @@ FROM ubuntu:18.04
 # install build essentials
 RUN apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
-      autoconf \
-      automake \
       ca-certificates \
       ccache \
       g++ \
@@ -39,7 +37,8 @@ ADD ci/docker_install_conda.sh \
     /arrow/ci/
 RUN arrow/ci/docker_install_conda.sh && \
     conda install -c conda-forge \
-        --file arrow/ci/conda_env_cpp.yml && \
+        --file arrow/ci/conda_env_cpp.yml \
+        --file arrow/ci/conda_env_unix.yml && \
     conda clean --all
 
 ENV CC=gcc \
diff --git a/python/doc/source/development.rst b/python/doc/source/development.rst
index 3bd6689..e86a0be 100644
--- a/python/doc/source/development.rst
+++ b/python/doc/source/development.rst
@@ -76,13 +76,24 @@ Using Conda
 Let's create a conda environment with all the C++ build and Python dependencies
 from conda-forge:
 
+On Linux and OSX:
+
+.. code-block:: shell
+
+    conda create -y -n pyarrow-dev -c conda-forge \
+        --file arrow/ci/conda_env_unix.yml \
+        --file arrow/ci/conda_env_cpp.yml \
+        --file arrow/ci/conda_env_python.yml \
+        python=3.6
+
+On Windows:
+
 .. code-block:: shell
 
-   conda create -y -q -n pyarrow-dev \
-         python=3.6 numpy six setuptools cython pandas pytest \
-         cmake flatbuffers rapidjson boost-cpp thrift-cpp snappy zlib \
-         gflags brotli jemalloc lz4-c zstd -c conda-forge
-   conda activate pyarrow-dev
+    conda create -y -n pyarrow-dev -c conda-forge ^
+        --file arrow\ci\conda_env_cpp.yml ^
+        --file arrow\ci\conda_env_python.yml ^
+        python=3.6
 
 We need to set some environment variables to let Arrow's build system know
 about our build toolchain: