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 64ec7f81884cd..b784b4ebf5e6a 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 + "\" @@ -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 fd79f907625e9..eba98be561397 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" @@ -18,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 b85263daa1eac..faf404ddcd293 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 @@ -48,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]" 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 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]