Skip to content
Merged
Changes from all commits
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
20 changes: 5 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ services: xvfb # needed for the python-control tests

# Start with a 2x4 matrix of Linux builds
python:
- "3.9
- "3.8"
- "3.7"
env:
Expand All @@ -20,14 +21,6 @@ jobs:
- name: "Linux, Conda Python 3.6"
python: "3.6"
env: TEST_PKG="conda" BLA_VENDOR="OpenBLAS"
- name: "Linux, Conda Python 3.5"
python: "3.5"
env: TEST_PKG="conda" BLA_VENDOR="OpenBLAS"
- name: "Linux, Ubuntu 16.04, System Python 2.7"
python: "2.7"
dist: xenial
env: TEST_PKG="dist" BLA_VENDOR="OpenBLAS"
# (Conda Python 2 is broken due to pytest-cov dependencies)
- name: "MacOSX, Conda Python 3"
os: osx
language: shell
Expand All @@ -36,14 +29,10 @@ jobs:
os: osx
language: shell
env: TEST_PKG="dist" BLA_VENDOR="Apple"
- name: "MacOSX, pyenv 3.8.0"
os: osx
language: shell
env: TEST_PKG="dist" BLA_VENDOR="Apple" SLYCOT_PYTHON_VERSION=3.8.0
- name: "MacOSX, pyenv 2.7.17"
- name: "MacOSX, pyenv 3.8.7"
os: osx
language: shell
env: TEST_PKG="dist" BLA_VENDOR="Apple" SLYCOT_PYTHON_VERSION=2.7.17
env: TEST_PKG="dist" BLA_VENDOR="Apple" SLYCOT_PYTHON_VERSION=3.8.7


before_install:
Expand Down Expand Up @@ -124,7 +113,8 @@ install:
$conda_blas
conda activate test-environment
export LIBRARY_PATH="$HOME/miniconda/envs/test-environment/lib"
conda build --python "$SLYCOT_PYTHON_VERSION" $conda_recipe
numpyversion=$(python -c 'import numpy; print(numpy.version.version)')
conda build --python "$SLYCOT_PYTHON_VERSION" --numpy $numpyversion $conda_recipe
conda install local::slycot
elif [[ $TEST_PKG == dist ]]; then
pip install scikit-build pytest-cov matplotlib scipy;
Expand Down