Skip to content

Commit 0f1efec

Browse files
authored
Merge pull request #141 from bnavigator/fix-travis-conda
fix conda install of built package in travis
2 parents 055e9d6 + 060aada commit 0f1efec

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

.travis.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ services: xvfb # needed for the python-control tests
66

77
# Start with a 2x4 matrix of Linux builds
88
python:
9+
- "3.9
910
- "3.8"
1011
- "3.7"
1112
env:
@@ -20,14 +21,6 @@ jobs:
2021
- name: "Linux, Conda Python 3.6"
2122
python: "3.6"
2223
env: TEST_PKG="conda" BLA_VENDOR="OpenBLAS"
23-
- name: "Linux, Conda Python 3.5"
24-
python: "3.5"
25-
env: TEST_PKG="conda" BLA_VENDOR="OpenBLAS"
26-
- name: "Linux, Ubuntu 16.04, System Python 2.7"
27-
python: "2.7"
28-
dist: xenial
29-
env: TEST_PKG="dist" BLA_VENDOR="OpenBLAS"
30-
# (Conda Python 2 is broken due to pytest-cov dependencies)
3124
- name: "MacOSX, Conda Python 3"
3225
os: osx
3326
language: shell
@@ -36,14 +29,10 @@ jobs:
3629
os: osx
3730
language: shell
3831
env: TEST_PKG="dist" BLA_VENDOR="Apple"
39-
- name: "MacOSX, pyenv 3.8.0"
40-
os: osx
41-
language: shell
42-
env: TEST_PKG="dist" BLA_VENDOR="Apple" SLYCOT_PYTHON_VERSION=3.8.0
43-
- name: "MacOSX, pyenv 2.7.17"
32+
- name: "MacOSX, pyenv 3.8.7"
4433
os: osx
4534
language: shell
46-
env: TEST_PKG="dist" BLA_VENDOR="Apple" SLYCOT_PYTHON_VERSION=2.7.17
35+
env: TEST_PKG="dist" BLA_VENDOR="Apple" SLYCOT_PYTHON_VERSION=3.8.7
4736

4837

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

0 commit comments

Comments
 (0)