Merge branch 'fix-omamer-2.1.1-issue'

fixes #74

Author: alpae

FastOMA/__init__.py

@@ -1,6 +1,6 @@
 
 __packagename__ = "FastOMA"
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 
 import logging
 logger = logging.getLogger("FastOMA")

README.md

@@ -60,7 +60,7 @@ installed.
 ```bash
 nextflow run dessimozlab/FastOMA -profile docker  --input_folder /path/to/in_folder --output_folder /path/to/out_folder 
 ```
-You could also add specific version to be used by adding `-r v0.4.0` to the command line. Without any `-r` argument, 
+You could also add specific version to be used by adding `-r v0.4.1` to the command line. Without any `-r` argument, 
 always the latest available release will be used. With `-r dev` the latest development release can be used.
 
 > [!WARNING]
@@ -99,10 +99,10 @@ There are four ways to run/install FastOMA detailed below:
 The FastOMA workflow can be run directly without any installation using nextflow's ability to fetch a workflow from github. A specific version can be selected by specifying the `-r` option to nextflow to select a specific version of FastOMA:
 
 ```bash
-nextflow run dessimozlab/FastOMA -r v0.4.0 -profile conda 
+nextflow run dessimozlab/FastOMA -r v0.4.1 -profile conda 
 ```
 
-This will fetch version v0.4.0 from github and run the FastOMA workflow using the conda profile. See section [How to run fastOMA](#how-to-run-fastoma). 
+This will fetch version v0.4.1 from github and run the FastOMA workflow using the conda profile. See section [How to run fastOMA](#how-to-run-fastoma). 
 
 ### 2. Cloning the FastOMA repo and running from there
 
@@ -195,7 +195,7 @@ nextflow run FastOMA.nf -profile docker \
     --output_folder myresult/
 ```
 This will use the container that is tagged with the current commit id. Similarly, one could also use 
-`--container_version "0.4.0"` to use the container with version `dessimozlab/fastoma:0.4.0` from dockerhub. Check the latest version on the [DockerHub](https://hub.docker.com/r/dessimozlab/fastoma/tags).
+`--container_version "0.4.1"` to use the container with version `dessimozlab/fastoma:0.4.1` from dockerhub. Check the latest version on the [DockerHub](https://hub.docker.com/r/dessimozlab/fastoma/tags).
 
 ### Singularity
 Since Docker needs administrator privileges (root access), [Singluarity](https://apptainer.org/index.html) (a.k.a Apptainer) is a good alternative. This can be installed using [Conda](https://anaconda.org/conda-forge/singularity) with `conda install conda-forge::singularity`. However, in most of the academic HPC cluster, singluarity is already installed and can be called with `module load`.
@@ -459,6 +459,8 @@ Citation:  Majidian, Sina, Yannis Nevers, Ali Yazdizadeh Kharrazi, Alex Warwick
 
 
 ## Change log
+- Update  v0.4.1:
+  - bump omamer to 2.1.2 (fixes a bug in the version 2.1.1, see [#74](https://github.com/DessimozLab/omamer/issues/74)
 - Update  v0.4.0:
   - Improvements for nextflow: alternative version selection, README updates
   - Split HOG and sampling improvements

nextflow.config

@@ -8,12 +8,12 @@ manifest {
   nextflowVersion = ">=22.10.4"
   defaultBranch = "main"
   doi = "10.1101/2024.01.29.577392"
-  version = "0.4.0"
+  version = "0.4.1"
 }
 
 params {
   container_name = "dessimozlab/fastoma"
-  container_version = "0.4.0"
+  container_version = "0.4.1"
   omamer_db = "https://omabrowser.org/All/LUCA.h5"
   debug_enabled = false
   help = false

pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "DendroPy >=4.5,<=4.6.1",
     "ete3 ~=3.1",
     "lxml >=4.6,<6",
-    "omamer ~=2.0",
+    "omamer ~=2.0, !=2.1.1",
     "pyham ~=1.1",
     "numpy",
     "pyparsing",