Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix travis config file (python 3.5 and 3.6 environments configured as…
… python 3.7)
  • Loading branch information
jgspiro committed May 13, 2019
commit ec3aed1983361cdb0d9ab3932ceb8362b95d67c8
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ matrix:
include:
- name: "Python 2.7, TEST_CONDA=0"
env: SLYCOT_PYTHON_VERSION=2.7 TEST_CONDA=0
- name: "Python 2.7, TEST_CONDA=1"
- name: "Python 2.7, TEST_CONDA=1"
env: SLYCOT_PYTHON_VERSION=2.7 TEST_CONDA=1

- name: "Python 3.5, TEST_CONDA=0"
env: SLYCOT_PYTHON_VERSION=3.7 TEST_CONDA=0
- name: "Python 3.5, TEST_CONDA=1"
env: SLYCOT_PYTHON_VERSION=3.7 TEST_CONDA=1
env: SLYCOT_PYTHON_VERSION=3.5 TEST_CONDA=0
- name: "Python 3.5, TEST_CONDA=1"
env: SLYCOT_PYTHON_VERSION=3.5 TEST_CONDA=1

- name: "Python 3.6, TEST_CONDA=0"
env: SLYCOT_PYTHON_VERSION=3.7 TEST_CONDA=0
- name: "Python 3.6, TEST_CONDA=1"
env: SLYCOT_PYTHON_VERSION=3.7 TEST_CONDA=1
env: SLYCOT_PYTHON_VERSION=3.6 TEST_CONDA=0
- name: "Python 3.6, TEST_CONDA=1"
env: SLYCOT_PYTHON_VERSION=3.6 TEST_CONDA=1

- name: "Python 3.7, TEST_CONDA=0"
env: SLYCOT_PYTHON_VERSION=3.7 TEST_CONDA=0
- name: "Python 3.7, TEST_CONDA=1"
- name: "Python 3.7, TEST_CONDA=1"
env: SLYCOT_PYTHON_VERSION=3.7 TEST_CONDA=1

before_install:
Expand Down Expand Up @@ -54,7 +54,7 @@ install:
# Set up a test environment for testing everything out
- conda create -q -n test-environment python="$SLYCOT_PYTHON_VERSION" pip coverage nose numpy openblas
- source activate test-environment

#
# Make sure that fortran compiler can find conda libraries
#
Expand All @@ -66,8 +66,8 @@ install:
conda install -c conda-forge scikit-build >=0.8.0 ;
fi
#
# Install the slycot package (two ways, to improve robustness). For the
# conda version, need to install lapack from conda-forge (no way to specify
# Install the slycot package (two ways, to improve robustness). For the
# conda version, need to install lapack from conda-forge (no way to specify
# this in the recipe).
# add the conda-forge channel to the config, otherwise openblas or
# lapack cannot be found in the check
Expand Down