File tree 8 files changed +11
-21
lines changed
8 files changed +11
-21
lines changed Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ install:
59
59
60
60
# install our build environment
61
61
- 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
63
63
- cmd : conda config --set ssl_verify false
64
64
65
65
# 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/"
7
7
8
8
function DownloadMiniconda ($python_version , $platform_suffix ) {
9
9
$webclient = New-Object System.Net.WebClient
10
- $filename = " Miniconda3-4.3.21 -Windows-" + $platform_suffix + " .exe"
10
+ $filename = " Miniconda3-latest -Windows-" + $platform_suffix + " .exe"
11
11
$url = $MINICONDA_URL + $filename
12
12
13
13
$basedir = $pwd.Path + " \"
@@ -85,7 +85,7 @@ function UpdateConda ($python_home) {
85
85
86
86
function main () {
87
87
InstallMiniconda " 3.5" $env: PYTHON_ARCH $env: CONDA_ROOT
88
- # UpdateConda $env:CONDA_ROOT
88
+ UpdateConda $env: CONDA_ROOT
89
89
InstallCondaPackages $env: CONDA_ROOT " conda-build jinja2 anaconda-client"
90
90
}
91
91
Original file line number Diff line number Diff line change @@ -10,17 +10,15 @@ echo "[Using clean Miniconda install]"
10
10
rm -rf " $MINICONDA_DIR "
11
11
12
12
# 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
16
14
bash miniconda.sh -b -p " $MINICONDA_DIR " || exit 1
17
15
18
16
export PATH=" $MINICONDA_DIR /bin:$PATH "
19
17
20
18
echo " [update conda]"
21
19
conda config --set ssl_verify false || exit 1
22
20
conda config --set always_yes true --set changeps1 false || exit 1
23
- # conda update -q conda
21
+ conda update -q conda
24
22
25
23
# add the pandas channel to take priority
26
24
# to add extra packages
Original file line number Diff line number Diff line change 34
34
35
35
# install miniconda
36
36
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
40
38
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
44
40
fi
45
41
time bash miniconda.sh -b -p " $MINICONDA_DIR " || exit 1
46
42
52
48
echo " [update conda]"
53
49
conda config --set ssl_verify false || exit 1
54
50
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
55
- # conda update -q conda
51
+ conda update -q conda
56
52
57
53
echo
58
54
echo " [add channels]"
Original file line number Diff line number Diff line change 16
16
psycopg2
17
17
pymysql
18
18
html5lib
19
- beautifulsoup4
19
+ beautiful-soup
Original file line number Diff line number Diff line change @@ -14,5 +14,5 @@ xlsxwriter
14
14
s3fs
15
15
bottleneck
16
16
html5lib
17
- beautifulsoup4
17
+ beautiful-soup
18
18
jinja2=2.8
Original file line number Diff line number Diff line change 13
13
xlwt
14
14
html5lib
15
15
patsy
16
- beautifulsoup4
16
+ beautiful-soup
17
17
numpy
18
18
cython
19
19
scipy
Original file line number Diff line number Diff line change @@ -799,10 +799,6 @@ def test_complibs(self):
799
799
# Remove lzo if its not available on this platform
800
800
if not tables .which_lib_version ('lzo' ):
801
801
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
-
806
802
all_levels = range (0 , 10 )
807
803
all_tests = [(lib , lvl ) for lib in all_complibs for lvl in all_levels ]
808
804
You can’t perform that action at this time.
0 commit comments