Skip to content

Commit 010942c

Browse files
committed
remove mkl
1 parent fb8c268 commit 010942c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ install:
1616
- conda install conda-build anaconda-client constructor
1717
- conda/template.py conda/meta.tpl $VERSION > conda/meta.yaml
1818
- conda build -c terhorst -c conda-forge -c bioconda conda
19+
- conda install --use-local smcpp
20+
- echo `which smc++`
21+
- test/integration/test.sh `which smc++`
1922
- conda/template.py conda/construct.tpl $VERSION > conda/construct.yaml
2023

2124
deploy:

conda/meta.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source:
99

1010
requirements:
1111
build:
12-
- python >=3.5
12+
- python 3.5
1313
- nomkl
1414
- gcc 4.8.5
1515
- libgcc 4.8.5
@@ -18,17 +18,17 @@ requirements:
1818
- gsl >=2.2
1919
- mpc >=1.0
2020
- mpfr >=3.1
21-
- numpy 1.11.1
21+
- numpy 1.11.3
2222
- setuptools_scm >=1.15.0
2323
run:
2424
- nomkl
25-
- python >=3.5
25+
- python 3.5
2626
- libgcc 4.8.5
2727
- gmp >=6.1
2828
- gsl >=2.2
2929
- mpc >=1.0
3030
- mpfr >=3.1
31-
- numpy 1.11.1
31+
- numpy 1.11.3
3232
- setuptools_scm >=1.15.0
3333
- python >=3.5
3434
- pysam >=0.9.1.4

0 commit comments

Comments
 (0)