From 2ef43bd050850956ba9ce12694b9bba31731b6a9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 29 Dec 2017 11:51:31 -0600 Subject: [PATCH 1/2] CI: Pin NumPy version --- ci/install_travis.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 693a2fe1fd6a6..2752557cc9b8f 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -114,6 +114,12 @@ if [ -e ${REQ} ]; then time bash $REQ || exit 1 fi +# Pin NumPy +echo ["pin NumPy"] +NUMPY_VERSION="$(conda list numpy | grep '^n.*' | awk '{print $2}')" +conda config --env --add pinned_packages numpy=" ${NUMPY_VERSION}" +conda config --show pinned_packages + time conda install -n pandas pytest>=3.1.0 time pip install pytest-xdist moto @@ -201,7 +207,7 @@ fi echo echo "[show pandas]" -conda list pandas +conda list -n pandas echo echo "[done]" From 620216d9a5abc24c373ecef6e5a2998e809861b2 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 29 Dec 2017 12:54:46 -0600 Subject: [PATCH 2/2] Remove conda pin --- ci/install_travis.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 2752557cc9b8f..1c1d256fa83db 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -56,11 +56,6 @@ if [ "$CONDA_BUILD_TEST" ]; then conda install conda-build fi -# TODO(jreback) -echo -echo "[fix conda version]" -conda install conda=4.3.30 - echo echo "[add channels]" conda config --remove channels defaults || exit 1