Skip to content

Commit cb197c6

Browse files
Revert "CI: Pin miniconda version (#17700)"
This reverts commit eaa5081.
1 parent eaa5081 commit cb197c6

8 files changed

+11
-21
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ install:
5959

6060
# install our build environment
6161
- cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
62-
# - cmd: conda update -q conda
62+
- cmd: conda update -q conda
6363
- cmd: conda config --set ssl_verify false
6464

6565
# add the pandas channel *before* defaults to have defaults take priority

ci/install.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
77

88
function DownloadMiniconda ($python_version, $platform_suffix) {
99
$webclient = New-Object System.Net.WebClient
10-
$filename = "Miniconda3-4.3.21-Windows-" + $platform_suffix + ".exe"
10+
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
1111
$url = $MINICONDA_URL + $filename
1212

1313
$basedir = $pwd.Path + "\"
@@ -85,7 +85,7 @@ function UpdateConda ($python_home) {
8585

8686
function main () {
8787
InstallMiniconda "3.5" $env:PYTHON_ARCH $env:CONDA_ROOT
88-
# UpdateConda $env:CONDA_ROOT
88+
UpdateConda $env:CONDA_ROOT
8989
InstallCondaPackages $env:CONDA_ROOT "conda-build jinja2 anaconda-client"
9090
}
9191

ci/install_circle.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@ echo "[Using clean Miniconda install]"
1010
rm -rf "$MINICONDA_DIR"
1111

1212
# install miniconda
13-
# wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1
14-
# Pin miniconda
15-
wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -q -O miniconda.sh || exit 1
13+
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -q -O miniconda.sh || exit 1
1614
bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
1715

1816
export PATH="$MINICONDA_DIR/bin:$PATH"
1917

2018
echo "[update conda]"
2119
conda config --set ssl_verify false || exit 1
2220
conda config --set always_yes true --set changeps1 false || exit 1
23-
# conda update -q conda
21+
conda update -q conda
2422

2523
# add the pandas channel to take priority
2624
# to add extra packages

ci/install_travis.sh

+3-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ fi
3434

3535
# install miniconda
3636
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
37-
# temporarily pin miniconda
38-
# time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
39-
time wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-MacOSX-x86_64.sh -O miniconda.sh || exit 1
37+
time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
4038
else
41-
# temporarily pin miniconda
42-
# time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
43-
time wget https://repo.continuum.io/miniconda/Miniconda2-4.3.21-Linux-x86_64.sh -O miniconda.sh || exit 1
39+
time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
4440
fi
4541
time bash miniconda.sh -b -p "$MINICONDA_DIR" || exit 1
4642

@@ -52,7 +48,7 @@ echo
5248
echo "[update conda]"
5349
conda config --set ssl_verify false || exit 1
5450
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
55-
# conda update -q conda
51+
conda update -q conda
5652

5753
echo
5854
echo "[add channels]"

ci/requirements-2.7_SLOW.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ s3fs
1616
psycopg2
1717
pymysql
1818
html5lib
19-
beautifulsoup4
19+
beautiful-soup

ci/requirements-2.7_WIN.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ xlsxwriter
1414
s3fs
1515
bottleneck
1616
html5lib
17-
beautifulsoup4
17+
beautiful-soup
1818
jinja2=2.8

ci/requirements_all.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ xlrd
1313
xlwt
1414
html5lib
1515
patsy
16-
beautifulsoup4
16+
beautiful-soup
1717
numpy
1818
cython
1919
scipy

pandas/tests/io/test_pytables.py

-4
Original file line numberDiff line numberDiff line change
@@ -799,10 +799,6 @@ def test_complibs(self):
799799
# Remove lzo if its not available on this platform
800800
if not tables.which_lib_version('lzo'):
801801
all_complibs.remove('lzo')
802-
# Remove bzip2 if its not available on this platform
803-
if not tables.which_lib_version("bzip2"):
804-
all_complibs.remove("bzip2")
805-
806802
all_levels = range(0, 10)
807803
all_tests = [(lib, lvl) for lib in all_complibs for lvl in all_levels]
808804

0 commit comments

Comments
 (0)