Skip to content

Commit

Permalink
Merge remote-tracking branch 'bioconda_origin/master' into saccharis
Browse files Browse the repository at this point in the history
# Conflicts:
#	recipes/saccharis/meta.yaml
  • Loading branch information
AlexSCFraser committed Nov 14, 2024
2 parents 4031ee7 + a78b158 commit 34e85f8
Show file tree
Hide file tree
Showing 164 changed files with 3,636 additions and 4,912 deletions.
1 change: 0 additions & 1 deletion build-fail-blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ recipes/unitig-counter
recipes/probcons
recipes/spydrpick
recipes/bctools
recipes/bayestyper
recipes/group_humann2_uniref_abundances_to_go
recipes/isonclust2
recipes/sibelia
Expand Down
8 changes: 4 additions & 4 deletions recipes/arcs/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% set version = "1.2.7" %}
{% set version = "1.2.8" %}

package:
name: arcs
version: {{ version }}

build:
number: 2
number: 0
run_exports:
- {{ pin_subpackage('arcs', max_pin="x") }}

source:
url: https://github.com/bcgsc/arcs/releases/download/v{{ version }}/arcs-{{ version }}.tar.gz
sha256: 3162cff3286a033b494ace8050abc96d4083f846cafe921bb0122170f705eca8
sha256: 3393151980ee1e031ff47d32e2871745255a08e9e76f27657e868137b4ddd2df

requirements:
build:
Expand Down Expand Up @@ -43,4 +43,4 @@ about:
extra:
additional-platforms:
- linux-aarch64
- osx-arm64
- osx-arm64
7 changes: 4 additions & 3 deletions recipes/argo/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% set name = "argo" %}
{% set version = "0.1.1" %}
{% set version = "0.1.2" %}

package:
name: '{{ name|lower }}'
version: '{{ version }}'

source:
url: https://github.com/xinehc/argo/archive/refs/tags/v{{ version }}.tar.gz
sha256: 9ddc3bea602e3bdcd3518bb3ecd7795b680addaa513eff0fff83e1010ba4e253
sha256: 71f9b113efc07df0101887c1c7450ca12f77b120fd9ebd841ddfdba1b7ff2fe0

build:
noarch: python
Expand All @@ -19,6 +19,7 @@ build:
requirements:
host:
- pip
- setuptools
- python >=3.7
run:
- python >=3.7
Expand All @@ -36,7 +37,7 @@ about:
home: https://github.com/xinehc/argo
license: MIT
license_family: MIT
summary: 'Argo: species-resolved profiling of antibiotic resistant genes with long-read metagenomics'
summary: 'Argo: species-resolved profiling of antibiotic resistance genes in complex metagenomes through long-read overlapping'

extra:
recipe-maintainers:
Expand Down
43 changes: 18 additions & 25 deletions recipes/artic/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,83 +1,76 @@
{% set name = "artic" %}
{% set version = "1.2.4" %}
{% set sha256 = "981219a49cec01dc82a9375b16f844278e797ad4034efa1eaa410ccb1849c617" %}
{% set version = "1.5.3" %}
{% set sha256 = "107483f22de571c4aafae91c475e453d939e6a8e85a7e2cd2d23ccbca224ef1c" %}

package:
name: {{ name|lower }}
version: {{ version|replace("-", "_") }}

source:
url: https://github.com/artic-network/fieldbioinformatics/archive/v{{ version }}.tar.gz
sha256: {{ sha256 }}

build:
number: 1
number: 0
noarch: python
run_exports:
- {{ pin_subpackage('artic', max_pin='x.x') }}
script: python -m pip install --ignore-installed .
script: {{ PYTHON }} -m pip install --no-deps --no-build-isolation --no-cache-dir . -vvv
entry_points:
- artic=artic.pipeline:main
- align_trim=artic.align_trim:main
- align_trim_n=artic.align_trim_n:main
- margin_cons=artic.margin_cons:main
- margin_cons_medaka=artic.margin_cons_medaka:main
- vcfextract=artic.vcfextract:main
- artic_vcf_merge=artic.vcf_merge:main
- artic_vcf_filter=artic.vcf_filter:main
- artic_make_depth_mask=artic.make_depth_mask:main
- artic_fasta_header=artic.fasta_header:main
- artic_mask=artic.mask:main
- artic_get_stats=artic.artic_mqc:main
- artic_get_models=artic.get_models:main

requirements:
host:
- python >=3
- python ==3.9
- pip
- setuptools
run:
- python
- artic-porechop >=0.3.2pre
- artic-tools
- longshot
- python ==3.9
- bcftools
- biopython
- bwa
- clair3
- clint
- htslib
- medaka >=1.10.0
- minimap2 >=2.26
- minimap2
- multiqc
- muscle =3.8
- nanopolish >=0.14.0
- muscle <5.1
- pandas
- pip
- pysam
- pytest
- pyvcf
- cyvcf2
- pyfaidx =0.6.0 # DO NOT CHANGE THIS PIN UNDER ANY CIRCUMSTANCES, IT WILL BREAK THE PIPELINE
- requests
- samtools
- tqdm
- keras-preprocessing >=1.1.2


test:
commands:
- artic -h
- align_trim -h
- align_trim_n -h
- margin_cons -h
- margin_cons_medaka -h
- vcfextract -h
- artic_vcf_merge -h
- artic_vcf_filter -h
- artic_make_depth_mask -h
- artic_fasta_header -h
- artic_mask -h
- artic_get_stats -h
- artic_get_models -h

about:
home: https://github.com/artic-network/fieldbioinformatics
license: MIT
license_family: MIT
license_file: LICENSE
summary: ARTIC pipeline - a bioinformatics pipeline for working with virus sequencing data sequenced with nanopore

summary: "ARTIC pipeline - a bioinformatics pipeline for working with virus sequencing data sequenced with nanopore."
dev_url: https://github.com/artic-network/fieldbioinformatics
doc_url: https://artic.readthedocs.io/en/latest
9 changes: 3 additions & 6 deletions recipes/aspera-cli/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mkdir -p $GEM_HOME
gem build aspera-cli.gemspec
gem install --install-dir $GEM_HOME --bindir $GEM_HOME/bin ${PKG_NAME}-${PKG_VERSION}.gem
gem_path=$GEM_HOME/gems/${PKG_NAME}-${PKG_VERSION}
cp -r $SRC_DIR/* $gem_path
cp -rf $SRC_DIR/* $gem_path
rm $gem_path/{conda_build,build_env_setup}.sh
tail -n+3 bin/ascli > $gem_path/bin/ascli
tail -n+3 bin/asession > $gem_path/bin/asession
Expand All @@ -25,9 +25,6 @@ EOF
echo "$(cat header.txt $gem_path/bin/ascli)" > $gem_path/bin/ascli
echo "$(cat header.txt $gem_path/bin/asession)" > $gem_path/bin/asession

ln -s $gem_path/bin/* $PREFIX/bin
ln -sf $gem_path/bin/* $PREFIX/bin

export ASCLI_HOME="$PREFIX/etc/aspera"
ascli conf ascp install && ascli config ascp info
cp $ASCLI_HOME/aspera-license .
ln -s $ASCLI_HOME/{ascp,aspera-license} $PREFIX/bin
ascli conf ascp install && ascli config ascp info
23 changes: 10 additions & 13 deletions recipes/aspera-cli/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{% set name = "aspera-cli" %}
{% set version = "4.14.0" %}
{% set version = "4.19.0" %}

package:
name: "{{ name|lower }}"
version: "{{ version }}"

source:
- url: https://github.com/IBM/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz
sha256: b46df368df71ad926605e85ea4b61b9e48335cce8be31ac04d97ee6f71109f03
sha256: e4f9eb47510094132ff02960764254dfc322f1a16c9ad2b8abc60a54e5e21da1

build:
noarch: generic
number: 1
number: 0
run_exports:
- {{ pin_subpackage('aspera-cli', max_pin="x") }}

requirements:
build:
- ruby >=3
host:
- ruby >=3
run:
Expand All @@ -26,16 +24,15 @@ requirements:
test:
commands:
- ascli -h
- ascp -h

about:
home: https://github.com/IBM/aspera-cli
license: Apache-2.0
license_file:
- LICENSE
- aspera-license
summary: "Command Line Interface for IBM Aspera products"
dev_url: https://github.com/IBM/aspera-cli
home: "https://github.com/IBM/aspera-cli"
license: "Apache-2.0"
license_file: LICENSE
license_family: APACHE
summary: "Command Line Interface for IBM Aspera products."
dev_url: "https://github.com/IBM/aspera-cli"
doc_url: "https://www.rubydoc.info/gems/aspera-cli"

extra:
recipe-maintainers:
Expand Down
31 changes: 22 additions & 9 deletions recipes/atlas/build.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
#!/bin/bash

export CFLAGS="$CFLAGS -I$PREFIX/include"
export LDFLAGS="$LDFLAGS -L$PREFIX/lib"
export LD_LIBRARY_PATH="${PREFIX}/lib"
export LIBRARY_PATH="${PREFIX}/lib"
export CPATH="${PREFIX}/include"
export INCLUDES="-I${PREFIX}/include"
export LIBPATH="-L${PREFIX}/lib"
export LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
export CXXFLAGS="${CXXFLAGS} -O3 -I${PREFIX}/include"

sed -i.bak 's/^GIT_HEADER/#GIT_HEADER/' makefile
if [[ `uname` == "Darwin" ]]; then
export CONFIG_ARGS="-DCMAKE_FIND_FRAMEWORK=NEVER -DCMAKE_FIND_APPBUNDLE=NEVER"
export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
else
export CONFIG_ARGS=""
fi

make CXX=$CXX ARM=false
cmake . -GNinja \
-DCONDA=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_CXX_COMPILER="${CXX}" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
"${CONFIG_ARGS}"

mkdir -p $PREFIX/bin
cp atlas $PREFIX/bin
ninja || exit 1

mkdir -p ${PREFIX}/bin
cp atlas ${PREFIX}/bin || exit 1
chmod +x ${PREFIX}/bin/atlas
80 changes: 53 additions & 27 deletions recipes/atlas/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,65 @@
{% set version = "0.9.9" %}
{% set version = "2.0.0" %}

package:
package:
name: atlas
version: {{ version }}

source:
url: https://bitbucket.org/wegmannlab/atlas/get/{{ version }}.tar.gz
sha256: 7b65eae5ab7ff439accd53febf8caa15ad9d8230278eee31fd5c2e95bf021990
url: https://bitbucket.org/wegmannlab/atlas/get/{{ version }}-rc.6.tar.gz
sha256: 017235049dddfac88fedf16bfc444cf38aed25ac84df084dc555736b5d48d6a3

build:
number: 3
number: 0
run_exports:
- {{ pin_subpackage("atlas", max_pin="x") }}

requirements:
build:
- make
- {{ compiler('cxx') }}
- zlib
- armadillo
- libblas
- openblas
host:
- zlib
- armadillo
- libblas
- openblas
run:
- libblas
- zlib
- armadillo
build:
- {{ compiler('cxx') }}
- cmake
- git
- ninja
- sysroot_linux-64 =2.17 # [linux]
host:
- armadillo
- fmt
- htslib
- lapack
- libgomp # [linux]
- llvm-openmp # [osx]
- nlohmann_json
- openblas
- sysroot_linux-64 =2.17 # [linux]
- jsoncpp
- zlib
run:
- armadillo
- fmt
- htslib
- lapack
- libgomp # [linux]
- llvm-openmp # [osx]
- nlohmann_json
- openblas
- sysroot_linux-64 =2.17 # [linux]
- jsoncpp

test:
commands:
- atlas task=recal | grep Wegmann

commands:
- atlas | grep "successfully"
- atlas simulate
- atlas HKY85 --bam ATLAS_simulations.bam --fasta ATLAS_simulations.fasta
- atlas GLF --bam ATLAS_simulations.bam
- atlas saf --glf ATLAS_simulations.glf.gz --fasta ATLAS_simulations.fasta
- atlas majorMinor --glf ATLAS_simulations.glf.gz
- rm ATLAS_* *.parameters saf.saf.* || exit 1

about:
home: https://bitbucket.org/wegmannlab/atlas/wiki/Home
license: GPLv3
summary: "ATLAS, a suite of methods to accurately genotype and estimate genetic diversity"
home: https://atlaswiki.netlify.app
license: MPL-2.0
summary: "ATLAS: Analysis Tools for Ancient and Low-depth Samples"

extra:
additional-platforms:
- linux-aarch64
- osx-arm64
Loading

0 comments on commit 34e85f8

Please sign in to comment.