[ci skip] Merge PR 22967

Merge PR #22967, commits were: * Update build.sh Bactopia changed how versions were handled * Update meta.yaml The pin for Bowtie2 is related to #22836 * Update bactopia to 1.4.0
bioconda · Jul 3, 2020 · c1d90c1 · c1d90c1
1 parent 912ca73
commit c1d90c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/recipes/bactopia/build.sh b/recipes/bactopia/build.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-BACTOPIA="${PREFIX}/share/${PKG_NAME}-${PKG_VERSION}"
+BACTOPIA_VERSION="${PKG_VERSION%.*}.x"
+BACTOPIA="${PREFIX}/share/${PKG_NAME}-${BACTOPIA_VERSION}"
 mkdir -p ${PREFIX}/bin ${BACTOPIA}
 
 chmod 777 bactopia

diff --git a/recipes/bactopia/meta.yaml b/recipes/bactopia/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.3.1" %}
+{% set version = "1.4.0" %}
 
 package:
   name: bactopia
@@ -10,14 +10,15 @@ build:
 
 source:
   url: https://github.com/bactopia/bactopia/archive/v{{version}}.tar.gz
-  sha256: 0cf528275dcdb38badd3dbf10ddadc90289cec3ad2e9798184d9e0ae94b39882
+  sha256: e31012f8ed8225fabad4d5b96a34a38cbdb78e65b7543f945ac67876a357d865
 
 requirements:
   run:
     - ariba
     - beautifulsoup4
     - biopython
     - blast
+    - bowtie2 <2.4.0 
     - cd-hit
     - conda
     - executor