Skip to content

Commit

Permalink
BLD/FIX: appveyor: Drop py34 and bump miniconda to fix broken conda (#…
Browse files Browse the repository at this point in the history
…145)

* BLD/FIX: appveyor: Bump miniconda to fix broken conda

* FIX/TST: appveyor: Drop py34 and add py35 test

* BLD: Travis: Try to remove gmpy2 during install
  • Loading branch information
bocklund authored and richardotis committed Nov 12, 2017
1 parent 3d7a550 commit b1baf94
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ install:
source $HOME/miniconda2/bin/activate condaenv
conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy matplotlib nose pandas sympy pyparsing dask dill
conda install --yes xarray gcc cython
# install (for py34) and remove gmpy2 for Mac builds
conda install --yes gmpy2
conda remove --force gmpy2 --yes
pip install -e .
fi
Expand Down
5 changes: 2 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python34-conda64"
PYTHON_VERSION: "3.4"
- PYTHON: "C:\\Python35-conda64"
PYTHON_VERSION: "3.5"
PYTHON_ARCH: "64"
DISTUTILS_USE_SDK: "1"

- PYTHON: "C:\\Python36-conda64"
PYTHON_VERSION: "3.6"
Expand Down
4 changes: 2 additions & 2 deletions ci/install_python.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ $BASE_URL = "https://www.python.org/ftp/python/"
function DownloadMiniconda ($python_version, $platform_suffix) {
$webclient = New-Object System.Net.WebClient
if ($python_version -eq "3.5") {
$filename = "Miniconda3-3.19.0-Windows-" + $platform_suffix + ".exe"
$filename = "Miniconda3-4.3.30-Windows-" + $platform_suffix + ".exe"
} else {
$filename = "Miniconda2-3.19.0-Windows-" + $platform_suffix + ".exe"
$filename = "Miniconda2-4.3.30-Windows-" + $platform_suffix + ".exe"
}
$url = $MINICONDA_URL + $filename

Expand Down

0 comments on commit b1baf94

Please sign in to comment.