Skip to content

Commit ef3781a

Browse files
committed
[build] streamline the process and fix incompatibilies with conda-build 3.x
1 parent 1af2ca6 commit ef3781a

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ install:
1717
- conda info -a
1818
- conda install conda-build anaconda-client constructor git
1919
- conda build -c terhorst -c conda-forge -c bioconda conda
20-
- conda create -n smcpp_install --use-local -c terhorst -c bioconda -c conda-forge smcpp
21-
- source activate smcpp_install
22-
- smc++ version
23-
- test/integration/test.sh `which smc++`
20+
- conda build -c terhorst -c conda-forge -c bioconda conda --output > .packages
2421
- conda/template.py conda/construct.tpl $VERSION > conda/construct.yaml
25-
- source deactivate
2622

2723
deploy:
2824
- provider: script

conda/construct.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ channels:
66
- http://conda.anaconda.org/terhorst
77
- http://conda.anaconda.org/conda-forge
88
specs:
9-
- python 3.6
109
- smcpp
10+
- python 3.6.*
1111
- conda 4.3.21
1212
post_install: post_install.sh
1313
license_file: ../LICENSE

conda/deploy.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/bin/bash -x
22
set -e
33
export PATH="$HOME/miniconda/bin:$PATH"
4-
anaconda -t $ANACONDA_TOKEN upload --force $(conda build --output conda)
4+
PKGS=$(conda build -c terhorst -c conda-forge -c bioconda conda --output)
5+
PKGS=$(cat .packages)
6+
anaconda -t $ANACONDA_TOKEN upload --force $PKGS
57

6-
# Next, build
8+
# Next, pull uploaded pkg and create a binary installed
79
constructor conda

conda/meta.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,5 @@ test:
6060
- smcpp
6161
- smcpp._smcpp
6262
source_files:
63-
- test/integration/test.sh
6463
- example/example.vcf.gz
6564
- example/example.vcf.gz.csi
66-
commands:
67-
- mkdir example
68-
- mv example.* example
69-
- ./test.sh smc++
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash -x
2-
SMC=$1
2+
SMC=$(which smc++)
33
set -e
44
$SMC vcf2smc -v example/example.vcf.gz /tmp/example.1.smc.gz 1 msp1:msp_0,msp_1,msp_2
55
$SMC vcf2smc -d msp_0 msp_0 example/example.vcf.gz /tmp/example.2.smc.gz 1 msp2:msp_0,msp_3,msp_4

0 commit comments

Comments
 (0)