Skip to content

Commit 090a8c0

Browse files
committed
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 <wesm+git@apache.org> Closes #3353 from wesm/ARROW-4200 and squashes the following commits: 4849a32 <Wes McKinney> Accept bkietz suggestions 576e63b <Wes McKinney> Also add nomkl to python/Dockerfile 9b39e83 <Wes McKinney> Get conda env files working on Windows, small cleaning to Python development instructions
1 parent cec7541 commit 090a8c0

File tree

5 files changed

+10
-18
lines changed

5 files changed

+10
-18
lines changed

ci/conda_env_python.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
cython
1919
cloudpickle
2020
hypothesis
21-
nomkl
2221
numpy
2322
pandas
2423
pytest
25-
rsync
2624
setuptools
2725
setuptools_scm

ci/conda_env_unix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
# conda package dependencies specific to Unix-like environments (Linux and macOS)
1919

2020
autoconf
21+
rsync

ci/travis_script_python.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ fi
4747

4848
conda create -y -q -p $CONDA_ENV_DIR \
4949
--file $TRAVIS_BUILD_DIR/ci/conda_env_python.yml \
50+
nomkl \
5051
cmake \
5152
pip \
5253
numpy=1.13.1 \

docs/source/python/development.rst

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,9 @@ On Linux and OSX:
8686
--file arrow/ci/conda_env_python.yml \
8787
python=3.6
8888
89-
source activate pyarrow-dev
89+
conda activate pyarrow-dev
9090
91-
On Windows:
92-
93-
.. code-block:: shell
94-
95-
conda create -y -n pyarrow-dev -c conda-forge ^
96-
--file arrow\ci\conda_env_cpp.yml ^
97-
--file arrow\ci\conda_env_python.yml ^
98-
python=3.6
99-
100-
activate pyarrow-dev
91+
For Windows, see the `Developing on Windows`_ section below.
10192

10293
We need to set some environment variables to let Arrow's build system know
10394
about our build toolchain:
@@ -310,11 +301,11 @@ First, starting from fresh clones of Apache Arrow:
310301
311302
.. code-block:: shell
312303
313-
conda create -y -q -n pyarrow-dev ^
314-
python=3.6 numpy six setuptools cython pandas pytest ^
315-
cmake flatbuffers rapidjson boost-cpp thrift-cpp snappy zlib ^
316-
gflags brotli lz4-c zstd -c conda-forge
317-
activate pyarrow-dev
304+
conda create -y -n pyarrow-dev -c conda-forge ^
305+
--file arrow\ci\conda_env_cpp.yml ^
306+
--file arrow\ci\conda_env_python.yml ^
307+
python=3.7
308+
conda activate pyarrow-dev
318309
319310
Now, we build and install Arrow C++ libraries
320311

python/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM arrow:cpp
2121
ARG PYTHON_VERSION=3.6
2222
ADD ci/conda_env_python.yml /arrow/ci/
2323
RUN conda install -c conda-forge \
24+
nomkl \
2425
--file arrow/ci/conda_env_python.yml \
2526
python=$PYTHON_VERSION && \
2627
conda clean --all

0 commit comments

Comments
 (0)