switched back to predixcan

scripts/singularity.def

@@ -35,29 +35,30 @@ From: rocker/verse:3.6.2
     make install
     (cd /usr/bin; ln -s /usr/bcftools/bin/bcftools bcftools)
 
-    # install MetaXcan and python dependencies
-    mkdir -p /usr/MetaXcan
+    # install PrediXcan and python dependencies
+    apt-get -y install \
+        python-pip
+    pip install \
+        argparse==1.4.0 numpy==1.18.1
+    mkdir -p /usr/PrediXcan
     (cd /usr; \
-        git clone https://github.com/hakyimlab/MetaXcan; \
-        cd MetaXcan; \
-        git checkout b5a1741244c32a30cd16d5eca5da4d0f38bc90a7)
-    ln -s /usr/MetaXcan/software/PrediXcan.py /usr/bin/predixcan
+        git clone https://github.com/hakyimlab/PrediXcan; \
+        cd PrediXcan; \
+        git checkout e77dd8a04a0345cb63aa634d4f8acc6aca9e25e0)
+    ln -s /usr/PrediXcan/software/PrediXcan.py /usr/bin/predixcan
     chmod +x /usr/bin/predixcan
-    pip3 install \
-        numpy==1.18.1 scipy==1.4.1 pandas==1.0.1 mock==4.0.1 sqlalchemy==1.3.13 \
-        patsy==0.5.1 statsmodels==0.11.1 h5py==2.10.0 h5py-cache==1.0
 
     # download, extract and store weights
     apt-get -y install wget
-    mkdir /usr/MetaXcan/weights
+    mkdir /usr/PrediXcan/weights
     wget https://zenodo.org/record/3518299/files/mashr_eqtl.tar?download=1 \
-        -O /usr/MetaXcan/weights/mashr_eqtl.tar
-    tar -C /usr/MetaXcan/weights/ -xvf /usr/MetaXcan/weights/mashr_eqtl.tar
-    rm /usr/MetaXcan/weights/mashr_eqtl.tar
+        -O /usr/PrediXcan/weights/mashr_eqtl.tar
+    tar -C /usr/PrediXcan/weights/ -xvf /usr/PrediXcan/weights/mashr_eqtl.tar
+    rm /usr/PrediXcan/weights/mashr_eqtl.tar
 
     # predixcan connects to the weights database with sql, needs write permission
     # even if the file system will be read only for the container
-    chmod -R 777 /usr/MetaXcan
+    chmod -R 777 /usr/PrediXcan
 
     # install R packages
     Rscript /tmp/install.R