Skip to content

Commit

Permalink
[build] streamline the process and fix incompatibilies with conda-bui…
Browse files Browse the repository at this point in the history
…ld 3.x
  • Loading branch information
terhorst committed Sep 22, 2017
1 parent 1af2ca6 commit ef3781a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 14 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ install:
- conda info -a
- conda install conda-build anaconda-client constructor git
- conda build -c terhorst -c conda-forge -c bioconda conda
- conda create -n smcpp_install --use-local -c terhorst -c bioconda -c conda-forge smcpp
- source activate smcpp_install
- smc++ version
- test/integration/test.sh `which smc++`
- conda build -c terhorst -c conda-forge -c bioconda conda --output > .packages
- conda/template.py conda/construct.tpl $VERSION > conda/construct.yaml
- source deactivate

deploy:
- provider: script
Expand Down
2 changes: 1 addition & 1 deletion conda/construct.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ channels:
- http://conda.anaconda.org/terhorst
- http://conda.anaconda.org/conda-forge
specs:
- python 3.6
- smcpp
- python 3.6.*
- conda 4.3.21
post_install: post_install.sh
license_file: ../LICENSE
6 changes: 4 additions & 2 deletions conda/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/bash -x
set -e
export PATH="$HOME/miniconda/bin:$PATH"
anaconda -t $ANACONDA_TOKEN upload --force $(conda build --output conda)
PKGS=$(conda build -c terhorst -c conda-forge -c bioconda conda --output)
PKGS=$(cat .packages)
anaconda -t $ANACONDA_TOKEN upload --force $PKGS

# Next, build
# Next, pull uploaded pkg and create a binary installed
constructor conda
5 changes: 0 additions & 5 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,5 @@ test:
- smcpp
- smcpp._smcpp
source_files:
- test/integration/test.sh
- example/example.vcf.gz
- example/example.vcf.gz.csi
commands:
- mkdir example
- mv example.* example
- ./test.sh smc++
2 changes: 1 addition & 1 deletion test/integration/test.sh → conda/run_test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash -x
SMC=$1
SMC=$(which smc++)
set -e
$SMC vcf2smc -v example/example.vcf.gz /tmp/example.1.smc.gz 1 msp1:msp_0,msp_1,msp_2
$SMC vcf2smc -d msp_0 msp_0 example/example.vcf.gz /tmp/example.2.smc.gz 1 msp2:msp_0,msp_3,msp_4
Expand Down

0 comments on commit ef3781a

Please sign in to comment.