update envs, update to v0.9.1

ohmeta · Jun 30, 2020 · 4bbb629 · 4bbb629
1 parent f160691
commit 4bbb629
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/metapi/__about__.py b/metapi/__about__.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python3
 
-__version__ = '0.9.0'
+__version__ = '0.9.1'
 __author__ = "Jie Zhu"
diff --git a/metapi/config.yaml b/metapi/config.yaml
@@ -358,5 +358,6 @@ upload:
     reference_genome: ""
 
 envs:
-  bioenv: "envs/bioenv.yaml"
+  bioenv3.7: "envs/bioenv3.7.yaml"
+  bioenv3.6: "envs/bioenv3.6.yaml"
   bioenv2: "envs/bioenv2.yaml"
diff --git a/metapi/corer.py b/metapi/corer.py
@@ -91,8 +91,12 @@ def init(args):
         print(project.__str__())
         project.create_dirs()
         conf, cluster = project.get_config()
-        conf["envs"]["bioenv"] = os.path.join(
-            os.path.realpath(args.workdir), "envs/bioenv.yaml"
+
+        conf["envs"]["bioenv3.7"] = os.path.join(
+            os.path.realpath(args.workdir), "envs/bioenv3.7.yaml"
+        )
+        conf["envs"]["bioenv3.6"] = os.path.join(
+            os.path.realpath(args.workdir), "envs/bioenv3.6.yaml"
         )
         conf["envs"]["bioenv2"] = os.path.join(
             os.path.realpath(args.workdir), "envs/bioenv2.yaml"

diff --git a/metapi/envs/bioenv2.yaml b/metapi/envs/bioenv2.yaml
@@ -3,6 +3,5 @@ channels:
   - bioconda
   - defaults
 dependencies:
-  #- drep=2.6.2
   - humann2=2.8.1
   - metaphlan2=2.8
diff --git a/metapi/envs/bioenv3.6.yaml b/metapi/envs/bioenv3.6.yaml
@@ -0,0 +1,6 @@
+channels:
+  - conda-forge
+  - bioconda
+  - defaults
+dependencies:
+  - drep=2.6.2
diff --git a/metapi/envs/bioenv.yaml → metapi/envs/bioenv3.7.yaml b/metapi/envs/bioenv.yaml → metapi/envs/bioenv3.7.yaml
@@ -7,7 +7,7 @@ dependencies:
   - bowtie2>=2.3.5.1
   - bracken>=2.6.0
   - bwa>=0.7.17
-  #- checkm-genome>=1.1.2
+  - checkm-genome>=1.1.2
   - concoct>=1.1.0
   - das_tool>=1.1.2
   - diamond>=0.9.32

diff --git a/metapi/rules/dereplicate.smk b/metapi/rules/dereplicate.smk
@@ -56,6 +56,8 @@ if config["params"]["dereplicate"]["drep"]["do"]:
         log:
             os.path.join(config["output"]["dereplicate"],
                          "logs/hmq.bins.{assembler}.{binner}.drep.log")
+        conda:
+            config["envs"]["bioenv3.6"]
         params:
             bin_suffix = "fa",
             filtering_genome_min_length = \