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 090a8c0 ARROW-4200: [C++/Python] Enable conda_env_python.yml to work
on Windows, simplify python/development.rst
090a8c0 is described below
commit 090a8c020611b2f75ec0e36d765cc6d48adbe9a7
Author: Wes McKinney <[email protected]>
AuthorDate: Tue Jan 8 22:59:00 2019 -0600
ARROW-4200: [C++/Python] Enable conda_env_python.yml to work on Windows,
simplify python/development.rst
I also removed nomkl from conda_env_python.yml. It's sort of a developer
decision whether or not they want to install the MKL -- we shouldn't force them
to _not_ have it
Author: Wes McKinney <[email protected]>
Closes #3353 from wesm/ARROW-4200 and squashes the following commits:
4849a326d <Wes McKinney> Accept bkietz suggestions
576e63b27 <Wes McKinney> Also add nomkl to python/Dockerfile
9b39e8300 <Wes McKinney> Get conda env files working on Windows, small
cleaning to Python development instructions
---
ci/conda_env_python.yml | 2 --
ci/conda_env_unix.yml | 1 +
ci/travis_script_python.sh | 1 +
docs/source/python/development.rst | 23 +++++++----------------
python/Dockerfile | 1 +
5 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/ci/conda_env_python.yml b/ci/conda_env_python.yml
index d3756cb..b51f5c3 100644
--- a/ci/conda_env_python.yml
+++ b/ci/conda_env_python.yml
@@ -18,10 +18,8 @@
cython
cloudpickle
hypothesis
-nomkl
numpy
pandas
pytest
-rsync
setuptools
setuptools_scm
diff --git a/ci/conda_env_unix.yml b/ci/conda_env_unix.yml
index eeb90e4..9ecf549 100644
--- a/ci/conda_env_unix.yml
+++ b/ci/conda_env_unix.yml
@@ -18,3 +18,4 @@
# conda package dependencies specific to Unix-like environments (Linux and
macOS)
autoconf
+rsync
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 69e115a..e9a1122 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -47,6 +47,7 @@ fi
conda create -y -q -p $CONDA_ENV_DIR \
--file $TRAVIS_BUILD_DIR/ci/conda_env_python.yml \
+ nomkl \
cmake \
pip \
numpy=1.13.1 \
diff --git a/docs/source/python/development.rst
b/docs/source/python/development.rst
index 0bc1c62..d855371 100644
--- a/docs/source/python/development.rst
+++ b/docs/source/python/development.rst
@@ -86,18 +86,9 @@ On Linux and OSX:
--file arrow/ci/conda_env_python.yml \
python=3.6
- source activate pyarrow-dev
+ conda activate pyarrow-dev
-On Windows:
-
-.. code-block:: shell
-
- 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
-
- activate pyarrow-dev
+For Windows, see the `Developing on Windows`_ section below.
We need to set some environment variables to let Arrow's build system know
about our build toolchain:
@@ -310,11 +301,11 @@ First, starting from fresh clones of Apache Arrow:
.. 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 lz4-c zstd -c conda-forge
- 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.7
+ conda activate pyarrow-dev
Now, we build and install Arrow C++ libraries
diff --git a/python/Dockerfile b/python/Dockerfile
index a99a420..ecabc94 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -21,6 +21,7 @@ FROM arrow:cpp
ARG PYTHON_VERSION=3.6
ADD ci/conda_env_python.yml /arrow/ci/
RUN conda install -c conda-forge \
+ nomkl \
--file arrow/ci/conda_env_python.yml \
python=$PYTHON_VERSION && \
conda clean --all
