File tree Expand file tree Collapse file tree 7 files changed +11
-17
lines changed Expand file tree Collapse file tree 7 files changed +11
-17
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-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
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,17 +10,15 @@ 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
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
1614bash miniconda.sh -b -p " $MINICONDA_DIR " ||  exit  1
1715
1816export  PATH=" $MINICONDA_DIR /bin:$PATH " 
1917
2018echo  " [update conda]" 
2119conda config --set ssl_verify false  ||  exit  1
2220conda 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
Original file line number Diff line number Diff line change 3434
3535#  install miniconda
3636if  [ " ${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
4038else 
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
4440fi 
4541time  bash miniconda.sh -b -p " $MINICONDA_DIR " ||  exit  1
4642
5248echo  " [update conda]" 
5349conda config --set ssl_verify false  ||  exit  1
5450conda config --set quiet true  --set always_yes true  --set changeps1 false  ||  exit  1
55- #   conda update -q conda
51+ conda update -q conda
5652
5753echo 
5854echo  " [add channels]" 
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ matplotlib
88openpyxl=1.6.2
99xlrd=0.9.2
1010sqlalchemy=0.9.6
11- lxml=3.2.1 
11+ lxml
1212scipy
1313xlsxwriter=0.5.2
1414s3fs
Original file line number Diff line number Diff line change @@ -8,5 +8,5 @@ xlrd=0.9.2
88bottleneck=1.0.0
99matplotlib=1.4.3
1010sqlalchemy=0.8.1
11- lxml=3.2.1 
11+ lxml
1212scipy
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ matplotlib
88openpyxl
99xlrd
1010sqlalchemy
11- lxml=3.2.1 
11+ lxml
1212scipy
1313xlsxwriter
1414s3fs
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments