From d51dd9d72cceb5efcc0930f348dc758dcbc3b36e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 Sep 2017 17:15:35 -0500 Subject: [PATCH 1/5] CI: Pin miniconda version --- ci/install.ps1 | 2 +- ci/install_circle.sh | 4 +++- ci/install_travis.sh | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ci/install.ps1 b/ci/install.ps1 index 64ec7f81884cd..5d6caa06273de 100644 --- a/ci/install.ps1 +++ b/ci/install.ps1 @@ -7,7 +7,7 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/" function DownloadMiniconda ($python_version, $platform_suffix) { $webclient = New-Object System.Net.WebClient - $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe" + $filename = "Miniconda3-4.3.21-Windows-" + $platform_suffix + ".exe" $url = $MINICONDA_URL + $filename $basedir = $pwd.Path + "\" diff --git a/ci/install_circle.sh b/ci/install_circle.sh index fd79f907625e9..b068e798d88cf 100755 --- a/ci/install_circle.sh +++ b/ci/install_circle.sh @@ -10,7 +10,9 @@ echo "[Using clean Miniconda install]" rm -rf "$MINICONDA_DIR" # install miniconda -wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1 +# wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1 +# Pin miniconda +wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -q -O miniconda.sh || exit 1 bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1 export PATH="$MINICONDA_DIR/bin:$PATH" diff --git a/ci/install_travis.sh b/ci/install_travis.sh index b85263daa1eac..8aaeb4316c0a9 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -34,9 +34,13 @@ fi # install miniconda if [ "${TRAVIS_OS_NAME}" == "osx" ]; then - time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1 + # temporarily pin miniconda + # time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1 + time wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-MacOSX-x86_64.sh -O miniconda.sh || exit 1 else - time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1 + # temporarily pin miniconda + # time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1 + time wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -O miniconda.sh || exit 1 fi time bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1 From a69e5217d647ee22af652e97c4a66c681ef5b9d7 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 Sep 2017 17:24:52 -0500 Subject: [PATCH 2/5] Don't update conda --- appveyor.yml | 2 +- ci/install.ps1 | 2 +- ci/install_circle.sh | 2 +- ci/install_travis.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1f8886f6d068..f1259f271ee39 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,7 +59,7 @@ install: # install our build environment - cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false - - cmd: conda update -q conda + # - cmd: conda update -q conda - cmd: conda config --set ssl_verify false # add the pandas channel *before* defaults to have defaults take priority diff --git a/ci/install.ps1 b/ci/install.ps1 index 5d6caa06273de..b784b4ebf5e6a 100644 --- a/ci/install.ps1 +++ b/ci/install.ps1 @@ -85,7 +85,7 @@ function UpdateConda ($python_home) { function main () { InstallMiniconda "3.5" $env:PYTHON_ARCH $env:CONDA_ROOT - UpdateConda $env:CONDA_ROOT + # UpdateConda $env:CONDA_ROOT InstallCondaPackages $env:CONDA_ROOT "conda-build jinja2 anaconda-client" } diff --git a/ci/install_circle.sh b/ci/install_circle.sh index b068e798d88cf..eba98be561397 100755 --- a/ci/install_circle.sh +++ b/ci/install_circle.sh @@ -20,7 +20,7 @@ export PATH="$MINICONDA_DIR/bin:$PATH" echo "[update conda]" conda config --set ssl_verify false || exit 1 conda config --set always_yes true --set changeps1 false || exit 1 -conda update -q conda +# conda update -q conda # add the pandas channel to take priority # to add extra packages diff --git a/ci/install_travis.sh b/ci/install_travis.sh index 8aaeb4316c0a9..faf404ddcd293 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -52,7 +52,7 @@ echo echo "[update conda]" conda config --set ssl_verify false || exit 1 conda config --set quiet true --set always_yes true --set changeps1 false || exit 1 -conda update -q conda +# conda update -q conda echo echo "[add channels]" From 09d8a74376233a90f1cf13cb35c85b2c16204b2f Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 Sep 2017 17:59:24 -0500 Subject: [PATCH 3/5] Install bzip2 on windows --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index f1259f271ee39..4f12d9916eeee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,6 +78,7 @@ install: - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run - cmd: echo "installing requirements from %REQ%" - cmd: conda install -n pandas --file=%REQ% + - cmd: conda install bzip2 # XXX: remove when fixed in defaults - cmd: conda list -n pandas - cmd: echo "installing requirements from %REQ% - done" From a33d078c96a8613b03222c893a8d747fbf2ad04b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 Sep 2017 19:20:45 -0500 Subject: [PATCH 4/5] Skip bzip2 if not installed --- appveyor.yml | 1 - pandas/tests/io/test_pytables.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4f12d9916eeee..f1259f271ee39 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,7 +78,6 @@ install: - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run - cmd: echo "installing requirements from %REQ%" - cmd: conda install -n pandas --file=%REQ% - - cmd: conda install bzip2 # XXX: remove when fixed in defaults - cmd: conda list -n pandas - cmd: echo "installing requirements from %REQ% - done" diff --git a/pandas/tests/io/test_pytables.py b/pandas/tests/io/test_pytables.py index ff21afc11d220..c5729d421758e 100644 --- a/pandas/tests/io/test_pytables.py +++ b/pandas/tests/io/test_pytables.py @@ -799,6 +799,10 @@ def test_complibs(self): # Remove lzo if its not available on this platform if not tables.which_lib_version('lzo'): all_complibs.remove('lzo') + # Remove bzip2 if its not available on this platform + if not tables.which_lib_version("bzip2"): + all_complibs.remove("bzip2") + all_levels = range(0, 10) all_tests = [(lib, lvl) for lib in all_complibs for lvl in all_levels] From 7bc883edf10370b2e2c227cac14dbceba4c6420e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 27 Sep 2017 20:47:01 -0500 Subject: [PATCH 5/5] Fix beautifulsoup4 package name --- ci/requirements-2.7_SLOW.run | 2 +- ci/requirements-2.7_WIN.run | 2 +- ci/requirements_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/requirements-2.7_SLOW.run b/ci/requirements-2.7_SLOW.run index f7708283ad04a..db95a6ccb2314 100644 --- a/ci/requirements-2.7_SLOW.run +++ b/ci/requirements-2.7_SLOW.run @@ -16,4 +16,4 @@ s3fs psycopg2 pymysql html5lib -beautiful-soup +beautifulsoup4 diff --git a/ci/requirements-2.7_WIN.run b/ci/requirements-2.7_WIN.run index f953682f52d45..a81542ee5006c 100644 --- a/ci/requirements-2.7_WIN.run +++ b/ci/requirements-2.7_WIN.run @@ -14,5 +14,5 @@ xlsxwriter s3fs bottleneck html5lib -beautiful-soup +beautifulsoup4 jinja2=2.8 diff --git a/ci/requirements_all.txt b/ci/requirements_all.txt index b153b6989df86..e13afd619f105 100644 --- a/ci/requirements_all.txt +++ b/ci/requirements_all.txt @@ -13,7 +13,7 @@ xlrd xlwt html5lib patsy -beautiful-soup +beautifulsoup4 numpy cython scipy