Skip to content

Commit

Permalink
Merge pull request #801 from maxplanck-ie/dev_adRn
Browse files Browse the repository at this point in the history
Switched createEnvs to mamba
  • Loading branch information
LeilyR committed Dec 10, 2021
2 parents ee2b40f + 65236f8 commit 9c943f9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bin/snakePipes
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def createCondaEnvs(args):
h = md5hash.hexdigest()

sys.stderr.write("Creating environment from {} in {}\n".format(os.path.join(baseDir, "shared/rules", env), condaDirUse))
cmd = ["conda", "env", "create", "--force", "--file", os.path.join(baseDir, "shared/rules", env)]
cmd = ["mamba", "env", "create", "--force", "--file", os.path.join(baseDir, "shared/rules", env)]
if '--conda-prefix' in cf['snakemakeOptions'] and (args.condaDir or args.keepCondaDir):
cmd += ["--prefix", os.path.join(condaDirUse, h)]
else:
Expand Down
5 changes: 3 additions & 2 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: snakepipes
version: 2.5.2
version: 2.5.3

source:
path: ../
Expand All @@ -14,12 +14,13 @@ requirements:
- python >=3
run:
- python >=3.7.0
- snakemake ==5.18.0
- snakemake >=6.2.1
- pandas
- graphviz
- fuzzywuzzy
- pyyaml >=5.1
- coreutils
- mamba

test:
commands:
Expand Down
9 changes: 8 additions & 1 deletion docs/content/News.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
snakePipes News
===============


snakePipes 2.5.3
----------------

* Switched to mamba by default at ``createEnvs`` function.


snakePipes 2.5.2
----------------

* snakemake version >= 6.2.1
* python version >= 3.7
* added snakeMake in readme
* bug fix 777, 781
* multiqc version = 1.10.1 to be able to report qc fir hic pipeline
* multiqc version = 1.10.1 to be able to report QC for HiC pipeline
* added snakemake catalog yaml


Expand Down
2 changes: 1 addition & 1 deletion snakePipes/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.5.2'
__version__ = '2.5.3'

0 comments on commit 9c943f9

Please sign in to comment.