File tree Expand file tree Collapse file tree 8 files changed +21
-11
lines changed Expand file tree Collapse file tree 8 files changed +21
-11
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
77
88function DownloadMiniconda ($python_version , $platform_suffix ) {
99 $webclient = New-Object System.Net.WebClient
10- $filename = " Miniconda3-latest -Windows-" + $platform_suffix + " .exe"
10+ $filename = " Miniconda3-4.3.21 -Windows-" + $platform_suffix + " .exe"
1111 $url = $MINICONDA_URL + $filename
1212
1313 $basedir = $pwd.Path + " \"
@@ -85,7 +85,7 @@ function UpdateConda ($python_home) {
8585
8686function 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
Original file line number Diff line number Diff line change @@ -10,15 +10,17 @@ echo "[Using clean Miniconda install]"
1010rm -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
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
1416bash miniconda.sh -b -p " $MINICONDA_DIR " || exit 1
1517
1618export PATH=" $MINICONDA_DIR /bin:$PATH "
1719
1820echo " [update conda]"
1921conda config --set ssl_verify false || exit 1
2022conda config --set always_yes true --set changeps1 false || exit 1
21- conda update -q conda
23+ # conda update -q conda
2224
2325# add the pandas channel to take priority
2426# to add extra packages
Original file line number Diff line number Diff line change 3434
3535# install miniconda
3636if [ " ${TRAVIS_OS_NAME} " == " osx" ]; then
37- time wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
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
3840else
39- time wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
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
4044fi
4145time bash miniconda.sh -b -p " $MINICONDA_DIR " || exit 1
4246
4852echo " [update conda]"
4953conda config --set ssl_verify false || exit 1
5054conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
51- conda update -q conda
55+ # conda update -q conda
5256
5357echo
5458echo " [add channels]"
Original file line number Diff line number Diff line change 1616psycopg2
1717pymysql
1818html5lib
19- beautiful-soup
19+ beautifulsoup4
Original file line number Diff line number Diff line change @@ -14,5 +14,5 @@ xlsxwriter
1414s3fs
1515bottleneck
1616html5lib
17- beautiful-soup
17+ beautifulsoup4
1818jinja2=2.8
Original file line number Diff line number Diff line change 1313xlwt
1414html5lib
1515patsy
16- beautiful-soup
16+ beautifulsoup4
1717numpy
1818cython
1919scipy
Original file line number Diff line number Diff line change @@ -799,6 +799,10 @@ 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+
802806 all_levels = range (0 , 10 )
803807 all_tests = [(lib , lvl ) for lib in all_complibs for lvl in all_levels ]
804808
You can’t perform that action at this time.
0 commit comments