You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/01/23 00:15:24 UTC
[arrow] branch master updated: ARROW-4321: [CI] Setup conda-forge
channel globally in docker containers
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 5a75bb2 ARROW-4321: [CI] Setup conda-forge channel globally in docker containers
5a75bb2 is described below
commit 5a75bb264da58454d3790f1c19fd0137f60f7a34
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Tue Jan 22 18:15:17 2019 -0600
ARROW-4321: [CI] Setup conda-forge channel globally in docker containers
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #3457 from kszucs/ARROW-4321 and squashes the following commits:
bfd79a715 <Krisztián Szűcs> remove pkgs/free
f38436206 <Krisztián Szűcs> setup conda-forge globally
---
c_glib/Dockerfile | 2 +-
ci/docker_install_conda.sh | 13 +++++++++++++
ci/travis_install_conda.sh | 1 -
dev/lint/Dockerfile | 2 +-
docs/Dockerfile | 3 +--
python/Dockerfile | 5 +++--
6 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/c_glib/Dockerfile b/c_glib/Dockerfile
index 7c8e412..7abfa17 100644
--- a/c_glib/Dockerfile
+++ b/c_glib/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get -q install --no-install-recommends -y \
libgirepository1.0-dev
ADD c_glib/Gemfile /arrow/c_glib/
-RUN conda install -c conda-forge meson=0.47.1 && \
+RUN conda install meson=0.47.1 && \
conda clean --all && \
gem install bundler && \
bundle install --gemfile arrow/c_glib/Gemfile
diff --git a/ci/docker_install_conda.sh b/ci/docker_install_conda.sh
index 427ee76..73c7162 100755
--- a/ci/docker_install_conda.sh
+++ b/ci/docker_install_conda.sh
@@ -27,3 +27,16 @@ rm /tmp/miniconda.sh
ln -s ${CONDA_PREFIX}/etc/profile.d/conda.sh /etc/profile.d/conda.sh
echo ". ${CONDA_PREFIX}/etc/profile.d/conda.sh" >> ~/.bashrc
echo "conda activate base" >> ~/.bashrc
+
+# Configure conda
+source $MINICONDA/etc/profile.d/conda.sh
+conda config --set show_channel_urls True
+
+# Help with SSL timeouts to S3
+conda config --set remote_connect_timeout_secs 12
+
+# Setup conda-forge
+conda config --add channels conda-forge
+
+# Update packages
+conda update --all -q -y
diff --git a/ci/travis_install_conda.sh b/ci/travis_install_conda.sh
index ade6392..49a2f21 100755
--- a/ci/travis_install_conda.sh
+++ b/ci/travis_install_conda.sh
@@ -67,7 +67,6 @@ else
# Help with SSL timeouts to S3
conda config --set remote_connect_timeout_secs 12
- conda config --add channels https://repo.continuum.io/pkgs/free
conda config --add channels conda-forge
fi
diff --git a/dev/lint/Dockerfile b/dev/lint/Dockerfile
index 71d7ec8..c7901e1 100644
--- a/dev/lint/Dockerfile
+++ b/dev/lint/Dockerfile
@@ -24,7 +24,7 @@ RUN apt-get install -y -q \
clang-tidy \
iwyu
-RUN conda install -c conda-forge flake8 && \
+RUN conda install flake8 && \
conda clean --all -y
# https://bugs.launchpad.net/ubuntu/+source/iwyu/+bug/1769334
diff --git a/docs/Dockerfile b/docs/Dockerfile
index 31ad84e..d9441c2 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -18,8 +18,7 @@
FROM arrow:python-3.6
ADD ci/conda_env_sphinx.yml /arrow/ci/
-RUN conda install -c conda-forge \
- --file arrow/ci/conda_env_sphinx.yml && \
+RUN conda install --file arrow/ci/conda_env_sphinx.yml && \
conda clean --all
CMD arrow/ci/docker_build_cpp.sh && \
diff --git a/python/Dockerfile b/python/Dockerfile
index e20f266..cad0427 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -20,9 +20,10 @@ FROM arrow:cpp
# install python specific packages
ARG PYTHON_VERSION=3.6
ADD ci/conda_env_python.yml /arrow/ci/
-RUN conda install -c conda-forge \
+RUN conda install \
--file arrow/ci/conda_env_python.yml \
- python=$PYTHON_VERSION nomkl && \
+ python=$PYTHON_VERSION \
+ nomkl && \
conda clean --all
ENV ARROW_PYTHON=ON \