From a9ab5a0ac0c2496e7b6940452f8e2fb8f808bed3 Mon Sep 17 00:00:00 2001
From: Laurent Modolo <laurent@modolo.fr>
Date: Fri, 22 Mar 2019 15:41:13 +0100
Subject: [PATCH] umitools: fix python version
---
apps/umitools/install_0.3.4.sh | 14 ++++----------
modulefiles/umitools/0.3.4.lua | 2 +-
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/apps/umitools/install_0.3.4.sh b/apps/umitools/install_0.3.4.sh
index 9963293..f5df8e1 100644
--- a/apps/umitools/install_0.3.4.sh
+++ b/apps/umitools/install_0.3.4.sh
@@ -37,15 +37,9 @@ source ../build_env.sh
module load Python/3.6.1
UMITOOLS_VERSION=0.3.4
-UMITOOLS_ROOT=/Xnfs/lbmcdb/common/modules/apps/UMITOOLS/${UMITOOLS_VERSION}
-mkdir -p ${UMITOOLS_VERSION}/lib/python3.6/dist-packages/
-PYTHONPATH=${UMITOOLS_ROOT}lib/python3.6/dist-packages/:$PYTHONPATH
+UMITOOLS_ROOT=/Xnfs/lbmcdb/common/modules/apps/umitools/${UMITOOLS_VERSION}
+mkdir -p ${UMITOOLS_VERSION}/lib/python3.5/dist-packages/
+PYTHONPATH=${UMITOOLS_ROOT}lib/python3.5/dist-packages/:$PYTHONPATH
-
-git clone https://github.com/weng-lab/umitools.git
-cd umitools
-python setup.py install --single-version-externally-managed --prefix ${UMITOOLS_ROOT} --record markupsafe_install.txt
-cd ..
-rm -Rf markupsafe
+pip install umitools==${UMITOOLS_VERSION} --prefix ${UMITOOLS_ROOT}
mv bin lib ${UMITOOLS_VERSION}/
-rm -Rf UMITOOLS
diff --git a/modulefiles/umitools/0.3.4.lua b/modulefiles/umitools/0.3.4.lua
index 8c0a40c..6010c13 100644
--- a/modulefiles/umitools/0.3.4.lua
+++ b/modulefiles/umitools/0.3.4.lua
@@ -39,6 +39,6 @@ conflict("cutadapt")
conflict("Python/2.7.13")
load("Python/3.6.1")
prereq_any("Python/3.6.1")
-prepend_path{"PYTHONPATH","/Xnfs/lbmcdb/common/modules/apps/umitools/0.3.4/lib/python3.6/site-packages/",delim=":",priority="0"}
+prepend_path{"PYTHONPATH","/Xnfs/lbmcdb/common/modules/apps/umitools/0.3.4/lib/python3.5/site-packages/",delim=":",priority="0"}
prepend_path{"PATH","/Xnfs/lbmcdb/common/modules/apps/umitools/0.3.4/bin",delim=":",priority="0"}
setenv("HTSEQ_PATH","/Xnfs/lbmcdb/common/modules/apps/umitools/0.3.4/bin")
--
GitLab