From ad8038a3fd5db2701818f8a30c0d57b0890af50d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 29 Mar 2020 15:12:07 +0200 Subject: [PATCH] Revert "python-3.7.6: Build hic2cool from source" This reverts commit 5e93e04d561fe4127982706ccad6466c3e071572. The requirements of hic2cool have been updated and we can fetch it with pip again [1] [2] [1]: https://github.com/4dn-dcic/hic2cool/issues/46 [2]: https://github.com/4dn-dcic/hic2cool/releases/tag/0.8.2 --- python-3.7.6-0.build.sh | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/python-3.7.6-0.build.sh b/python-3.7.6-0.build.sh index dabe6f0..935c69f 100755 --- a/python-3.7.6-0.build.sh +++ b/python-3.7.6-0.build.sh @@ -202,6 +202,7 @@ pip3 install --prefix=$PREFIX HTSeq pip3 install --prefix=$PREFIX keras pip3 install --prefix=$PREFIX MotifScan # Alena 30.8.2018 pip3 install --prefix=$PREFIX MAmotif +pip3 install --prefix=$PREFIX hic2cool # Helpdesk Robert Schoepflin 17.09.2018 #pip3 install --prefix=$PREFIX hifive # only python 2.7+ pip3 install --prefix=$PREFIX snakemake pip3 install --prefix=$PREFIX virtualenv # Donald @@ -308,41 +309,6 @@ pip3 install --prefix=$PREFIX multiqc python3 setup.py install --prefix $PREFIX ) -# hic2cool # Helpdesk Robert Schoepflin 17.09.2018 -# build from source to avoid downgrading other packages (scipy, numpy) -( - HICVERS=0.8.0 - - . ${PREFIX}/profile - cd $BUILDDIR - test -e hic2cool-${HICVERS}.tar.gz || wget https://github.com/4dn-dcic/hic2cool/archive/${HICVERS}/hic2cool-${HICVERS}.tar.gz - test -d hic2cool-${HICVERS} || tar -xf hic2cool-${HICVERS}.tar.gz - - cd hic2cool-${HICVERS} - - if $( grep '==' requirements.txt >/dev/null ); then - patch -p1 <<'EOFHIC' -diff --git a/requirements.txt b/requirements.txt -index d7e701b..9d3a01c 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,5 +1,5 @@ --h5py==2.8.0 --pandas==0.24.2 --numpy==1.16.3 --scipy==1.2.1 --cooler==0.8.5 -+h5py -+pandas -+numpy -+scipy -+cooler -EOFHIC -fi - pip3 install -r requirements.txt --prefix ${PREFIX} - python3 setup.py install --prefix ${PREFIX} -) - #tensorflow ( TFVERSION=2.1.0