Commit e494e507 authored by Stefan Behnel's avatar Stefan Behnel

Fix conda installer selection in travis build script for Stackless build.

parent 2d89fddb
...@@ -74,15 +74,16 @@ matrix: ...@@ -74,15 +74,16 @@ matrix:
language: cpp language: cpp
compiler: clang compiler: clang
cache: false cache: false
- env: STACKLESS=true BACKEND=c - env: STACKLESS=true BACKEND=c PY=2
python: 2.7 python: 2.7
- env: STACKLESS=true BACKEND=c - env: STACKLESS=true BACKEND=c PY=3
python: 3.6 python: 3.6
allow_failures: allow_failures:
- python: pypy - python: pypy
- python: pypy3 - python: pypy3
- python: 3.8-dev - python: 3.8-dev
- env: STACKLESS=true BACKEND=c - env: STACKLESS=true BACKEND=c PY=2
- env: STACKLESS=true BACKEND=c PY=3
exclude: exclude:
- python: pypy - python: pypy
env: BACKEND=cpp env: BACKEND=cpp
...@@ -106,7 +107,8 @@ before_install: ...@@ -106,7 +107,8 @@ before_install:
- | - |
if [[ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]]; then # Install Miniconda if [[ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]]; then # Install Miniconda
curl -s -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-MacOSX-x86_64.sh; if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then CONDA_PLATFORM=MacOSX; else CONDA_PLATFORM=Linux; fi;
curl -s -o miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-${CONDA_PLATFORM}-x86_64.sh;
bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh; bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh;
export PATH="$HOME/miniconda/bin:$PATH"; hash -r; export PATH="$HOME/miniconda/bin:$PATH"; hash -r;
#conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt; #conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment