Skip to content

Commit c3e76d3

Browse files
committed
Merge pull request #86 from mbillingr/travischeck
Check and update Travis CI
2 parents 7a5210b + aff16fc commit c3e76d3

File tree

4 files changed

+29
-6
lines changed

4 files changed

+29
-6
lines changed

.travis.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,24 @@ env:
99
matrix:
1010
#- DISTRIB="ubuntu" PYTHON_VERSION="2.7" INSTALL_ATLAS="true"
1111

12+
# This environment tests compatibility with oldest supported package versions
13+
- DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false"
14+
NUMPY_VERSION="1.8.0" SCIPY_VERSION="0.13.3"
15+
SKLEARN_VERSION="0.15.0" MATPLOTLIB_VERSION="1.4.0"
16+
INSTALL_SCOT="true" RUN_EXAMPLES="false" INSTALL_FORTRAN="true"
17+
1218
# This environment tests Python 2 support
1319
- DISTRIB="conda" PYTHON_VERSION="2.7" INSTALL_MKL="false"
14-
NUMPY_VERSION="1.9.2" SCIPY_VERSION="0.16.0"
15-
SKLEARN_VERSION="0.16.1" MATPLOTLIB_VERSION="1.4.3"
16-
INSTALL_SCOT="true" RUN_EXAMPLES="false"
20+
NUMPY_VERSION="1.10.1" SCIPY_VERSION="0.16.0"
21+
SKLEARN_VERSION="0.17.0" MATPLOTLIB_VERSION="1.5.1"
22+
INSTALL_SCOT="true" RUN_EXAMPLES="false" INSTALL_FORTRAN="false"
1723

1824
# This environment tests Python 3 support
1925
- DISTRIB="conda" PYTHON_VERSION="3.4" INSTALL_MKL="false"
20-
NUMPY_VERSION="1.9.2" SCIPY_VERSION="0.16.0"
21-
SKLEARN_VERSION="0.16.1" MATPLOTLIB_VERSION="1.4.3"
26+
NUMPY_VERSION="1.10.1" SCIPY_VERSION="0.16.0"
27+
SKLEARN_VERSION="0.17.0" MATPLOTLIB_VERSION="1.5.1"
2228
COVERAGE="true"
23-
INSTALL_SCOT="true" RUN_EXAMPLES="false"
29+
INSTALL_SCOT="true" RUN_EXAMPLES="false" INSTALL_FORTRAN="false"
2430

2531
install: source distributions/ci/install.sh
2632

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ Required: numpy, scipy
3434

3535
Optional: matplotlib, scikit-learn
3636

37+
The lowest supported versions of these libraries are numpy 1.8.0, scipy 0.13.3, scikit-learn 0.15.0, and
38+
matplotlib 1.4.0. Lower versions may work but are not tested.
39+
3740

3841
Examples
3942
--------

distributions/ci/install.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ if [[ "$DISTRIB" == "conda" ]]; then
3737
conda remove --yes --features mkl || echo "MKL not installed"
3838
fi
3939

40+
if [[ "$INSTALL_FORTRAN" == "true" ]]; then
41+
# Make sure that MKL is used
42+
conda install --yes libgfortran
43+
fi
44+
4045
elif [[ "$DISTRIB" == "ubuntu" ]]; then
4146
# Use standard ubuntu packages in their default version
4247
sudo apt-get install -qq python-scipy python-nose python-pip python-matplotlib python-sklearn

doc/source/getting_started.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,12 @@ Obtaining SCoT
1010

1111
The SCoT source repository is available at github: https://github.com/scot-dev/scot
1212

13+
14+
Requirements
15+
------------
16+
17+
SCoT depends on the packages numpy (http://www.numpy.org/) and scipy (http://scipy.org/). Furthermore, it supports
18+
scikit-learn (http://scikit-learn.org/) and matplotlib (http://matplotlib.org/).
19+
20+
The lowest supported versions of these libraries are numpy 1.8.0, scipy 0.13.3, scikit-learn 0.15.0, and
21+
matplotlib 1.4.0. Lower versions may work but are not tested.

0 commit comments

Comments
 (0)