You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2019/01/15 21:00:26 UTC
[arrow] branch master updated: [CI] Temporary fix for conda-forge
migration (#3406)
This is an automated email from the ASF dual-hosted git repository.
kszucs 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 143558e [CI] Temporary fix for conda-forge migration (#3406)
143558e is described below
commit 143558e1726d6468f4d624ad53d707f9df8a02a5
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Tue Jan 15 22:00:20 2019 +0100
[CI] Temporary fix for conda-forge migration (#3406)
* pin conda forge channel
* failed building wheel for pickle5
* verbose and optional pickle5 install
---
ci/appveyor-cpp-build.bat | 4 ++--
ci/appveyor-cpp-setup.bat | 2 +-
ci/appveyor-cpp-test-cmake-script.bat | 8 ++++----
ci/cpp-msvc-build-main.bat | 2 +-
ci/travis_before_script_c_glib.sh | 4 ++--
ci/travis_install_toolchain.sh | 2 +-
ci/travis_script_integration.sh | 6 +++---
ci/travis_script_manylinux.sh | 2 +-
ci/travis_script_python.sh | 11 ++++++-----
9 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
index 78f5e41..5b653a9 100644
--- a/ci/appveyor-cpp-build.bat
+++ b/ci/appveyor-cpp-build.bat
@@ -95,7 +95,7 @@ if "%JOB%" == "Build_Debug" (
exit /B 0
)
-conda create -n arrow -q -y -c conda-forge ^
+conda create -n arrow -q -y -c conda-forge/label/cf201901 ^
--file=ci\conda_env_python.yml ^
python=%PYTHON% ^
numpy=1.14 ^
@@ -110,7 +110,7 @@ set BOOST_LIBRARYDIR=%CONDA_PREFIX%\Library\lib
if "%JOB%" == "Toolchain" (
@rem Install pre-built "toolchain" packages for faster builds
- conda install -q -y -c conda-forge ^
+ conda install -q -y -c conda-forge/label/cf201901 ^
--file=ci\conda_env_cpp.yml ^
python=%PYTHON%
diff --git a/ci/appveyor-cpp-setup.bat b/ci/appveyor-cpp-setup.bat
index 4cae2cb..2a46d13 100644
--- a/ci/appveyor-cpp-setup.bat
+++ b/ci/appveyor-cpp-setup.bat
@@ -39,7 +39,7 @@ if defined need_vcvarsall (
)
)
-if "%GENERATOR%"=="Ninja" conda install -y -q ninja
+if "%GENERATOR%"=="Ninja" conda install -y -q ninja -c conda-forge/label/cf201901
if "%USE_CLCACHE%" == "true" (
@rem Use clcache for faster builds
diff --git a/ci/appveyor-cpp-test-cmake-script.bat b/ci/appveyor-cpp-test-cmake-script.bat
index 415406c..d55a24d 100644
--- a/ci/appveyor-cpp-test-cmake-script.bat
+++ b/ci/appveyor-cpp-test-cmake-script.bat
@@ -19,8 +19,8 @@
@rem Validate cmake script behaviour on missed lib in toolchain
set CONDA_ENV=arrow-cmake-tests-libs
-conda create -n %CONDA_ENV% -q -y
-conda install -n %CONDA_ENV% -q -y -c conda-forge boost-cpp
+conda create -n %CONDA_ENV% -q -y -c conda-forge/label/cf201901
+conda install -n %CONDA_ENV% -q -y -c conda-forge/label/cf201901 boost-cpp
call activate %CONDA_ENV%
set BUILD_DIR=cpp\build-cmake-test
@@ -161,8 +161,8 @@ call deactivate
@rem Validate libs availability in conda toolchain
set CONDA_ENV=arrow-cmake-tests-toolchain
-conda create -n %CONDA_ENV% -q -y
-conda install -n %CONDA_ENV% -q -y -c conda-forge ^
+conda create -n %CONDA_ENV% -q -y -c conda-forge/label/cf201901
+conda install -n %CONDA_ENV% -q -y -c conda-forge/label/cf201901 ^
--file=ci\conda_env_cpp.yml
call activate %CONDA_ENV%
diff --git a/ci/cpp-msvc-build-main.bat b/ci/cpp-msvc-build-main.bat
index d9d7e54..6629060 100644
--- a/ci/cpp-msvc-build-main.bat
+++ b/ci/cpp-msvc-build-main.bat
@@ -105,7 +105,7 @@ popd
call deactivate
-conda create -n wheel_test -q -y python=%PYTHON% || exit /B
+conda create -n wheel_test -q -y -c conda-forge/label/cf201901 python=%PYTHON% || exit /B
call activate wheel_test
diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
index e8dd0cd..8507f77 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -23,7 +23,7 @@ source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
-conda create -n meson -y -q python=3.6
+conda create -n meson -y -q -c conda-forge/label/cf201901 python=3.6
conda activate meson
pip install meson
@@ -36,7 +36,7 @@ else
autoconf-archive \
gtk-doc-tools \
libgirepository1.0-dev
- conda install -q -y ninja
+ conda install -q -y ninja -c conda-forge/label/cf201901
fi
gem install test-unit gobject-introspection
diff --git a/ci/travis_install_toolchain.sh b/ci/travis_install_toolchain.sh
index 82031e8..aa50d59 100755
--- a/ci/travis_install_toolchain.sh
+++ b/ci/travis_install_toolchain.sh
@@ -27,7 +27,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
fi
# Set up C++ toolchain from conda-forge packages for faster builds
- conda create -y -q -p $CPP_TOOLCHAIN \
+ conda create -y -q -p $CPP_TOOLCHAIN -c conda-forge/label/cf201901 \
--file=$TRAVIS_BUILD_DIR/ci/conda_env_cpp.yml \
${CONDA_LLVM} \
ccache \
diff --git a/ci/travis_script_integration.sh b/ci/travis_script_integration.sh
index 342db58..5571ebc 100755
--- a/ci/travis_script_integration.sh
+++ b/ci/travis_script_integration.sh
@@ -43,14 +43,14 @@ popd
pushd $ARROW_INTEGRATION_DIR
CONDA_ENV_NAME=arrow-integration-test
-conda create -y -q -n $CONDA_ENV_NAME python=3.5
+conda create -y -q -n $CONDA_ENV_NAME -c conda-forge/label/cf201901 python=3.5
conda activate $CONDA_ENV_NAME
# faster builds, please
-conda install -y nomkl
+conda install -y nomkl -c conda-forge/label/cf201901
# Expensive dependencies install from Continuum package repo
-conda install -y pip numpy six
+conda install -y pip numpy six -c conda-forge/label/cf201901
# ARROW-4008: Create a directory to write temporary files since /tmp can be
# unstable in Travis CI
diff --git a/ci/travis_script_manylinux.sh b/ci/travis_script_manylinux.sh
index 588d0f9..59b818a 100755
--- a/ci/travis_script_manylinux.sh
+++ b/ci/travis_script_manylinux.sh
@@ -34,7 +34,7 @@ source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
PYTHON_VERSION=3.6
CONDA_ENV_DIR=$TRAVIS_BUILD_DIR/pyarrow-test-$PYTHON_VERSION
-conda create -y -q -p $CONDA_ENV_DIR python=$PYTHON_VERSION
+conda create -y -q -p $CONDA_ENV_DIR -c conda-forge/label/cf201901 python=$PYTHON_VERSION
conda activate $CONDA_ENV_DIR
pip install -q tensorflow
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index c3e2d19..838d9b8 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -45,7 +45,7 @@ if [ $ARROW_TRAVIS_PYTHON_JVM == "1" ]; then
CONDA_JVM_DEPS="jpype1"
fi
-conda create -y -q -p $CONDA_ENV_DIR \
+conda create -y -q -p $CONDA_ENV_DIR -c conda-forge/label/cf201901 \
--file $TRAVIS_BUILD_DIR/ci/conda_env_python.yml \
nomkl \
cmake \
@@ -61,7 +61,7 @@ which python
if [ "$ARROW_TRAVIS_PYTHON_DOCS" == "1" ] && [ "$PYTHON_VERSION" == "3.6" ]; then
# Install documentation dependencies
- conda install -y -c conda-forge --file ci/conda_env_sphinx.yml
+ conda install -y -c conda-forge/label/cf201901 --file ci/conda_env_sphinx.yml
fi
# ARROW-2093: PyTorch increases the size of our conda dependency stack
@@ -74,7 +74,7 @@ fi
# fi
if [ $TRAVIS_OS_NAME != "osx" ]; then
- conda install -y -c conda-forge tensorflow
+ conda install -y -c conda-forge/label/cf201901 tensorflow
PYARROW_PYTEST_FLAGS="$PYARROW_PYTEST_FLAGS --tensorflow"
fi
@@ -126,8 +126,9 @@ pushd $ARROW_PYTHON_DIR
# Other stuff pip install
pip install -r requirements.txt
+# FIXME(kszucs): disabled in https://github.com/apache/arrow/pull/3406
if [ "$PYTHON_VERSION" == "3.6" ]; then
- pip install -q pickle5
+ pip install -vvv pickle5 || true
fi
if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
export PYARROW_GENERATE_COVERAGE=1
@@ -203,7 +204,7 @@ if [ "$ARROW_TRAVIS_PYTHON_BENCHMARKS" == "1" ] && [ "$PYTHON_VERSION" == "3.6"
# Unfortunately this won't ensure that all benchmarks succeed
# (see https://github.com/airspeed-velocity/asv/issues/449)
source deactivate
- conda create -y -q -n pyarrow_asv python=$PYTHON_VERSION
+ conda create -y -q -n pyarrow_asv python=$PYTHON_VERSION -c conda-forge/label/cf201901
conda activate pyarrow_asv
pip install -q git+https://github.com/pitrou/asv.git@customize_commands