Skip to content

Commit

Permalink
[CI] Temporary fix for conda-forge migration (#3406)
Browse files Browse the repository at this point in the history
* pin conda forge channel

* failed building wheel for pickle5

* verbose and optional pickle5 install
  • Loading branch information
kszucs committed Jan 15, 2019
1 parent 18c0e82 commit 143558e
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
4 changes: 2 additions & 2 deletions ci/appveyor-cpp-build.bat
Expand Up @@ -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 ^
Expand All @@ -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%

Expand Down
2 changes: 1 addition & 1 deletion ci/appveyor-cpp-setup.bat
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ci/appveyor-cpp-test-cmake-script.bat
Expand Up @@ -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
Expand Down Expand Up @@ -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%

Expand Down
2 changes: 1 addition & 1 deletion ci/cpp-msvc-build-main.bat
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ci/travis_before_script_c_glib.sh
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/travis_install_toolchain.sh
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions ci/travis_script_integration.sh
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/travis_script_manylinux.sh
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions ci/travis_script_python.sh
Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

2 comments on commit 143558e

@wesm
Copy link
Member

@wesm wesm commented on 143558e Jan 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like we might want to make the install channel a configurable variable to not have as much duplication / brittleness

@kszucs
Copy link
Member Author

@kszucs kszucs commented on 143558e Jan 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can conda config the channels globally.

Please sign in to comment.