Workaround for pypa/pip#3165

HumanCellAtlas · Apr 5, 2018 · 6540fd5 · 6540fd5
1 parent cad3258
commit 6540fd5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/site/datasets/census/hca-download-census b/site/datasets/census/hca-download-census
@@ -18,9 +18,9 @@ function initialize() {
 function install_hca_tool() {
     echo "Installing hca tool (see ${LOGFILE} for errors)..."
 
-    if ! pip install --upgrade hca >> ${LOGFILE} 2>&1 ; then
+    if ! pip install hca --upgrade --ignore-installed six >> ${LOGFILE} 2>&1 ; then
         echo -e "\n\nThat failed, trying again as superuser.  You may be prompted for your password..."
-        sudo pip install --upgrade hca 2>&1 >> ${LOGFILE}
+        sudo pip install hca --upgrade --ignore-installed six 2>&1 >> ${LOGFILE}
     fi
 
     HCA=hca

diff --git a/site/datasets/ischaemic-sensitivity/hca-download-ischaemic-sensitivity b/site/datasets/ischaemic-sensitivity/hca-download-ischaemic-sensitivity
@@ -18,9 +18,9 @@ function initialize() {
 function install_hca_tool() {
     echo "Installing hca tool (see ${LOGFILE} for errors)..."
 
-    if ! pip install --upgrade hca >> ${LOGFILE} 2>&1 ; then
+    if ! pip install hca --upgrade --ignore-installed six >> ${LOGFILE} 2>&1 ; then
         echo -e "\n\nThat failed, trying again as superuser.  You may be prompted for your password..."
-        sudo pip install --upgrade hca 2>&1 >> ${LOGFILE}
+        sudo pip install hca --upgrade --ignore-installed six 2>&1 >> ${LOGFILE}
     fi
 
     HCA=hca

diff --git a/site/datasets/melanoma/hca-download-melanoma b/site/datasets/melanoma/hca-download-melanoma
@@ -18,9 +18,9 @@ function initialize() {
 function install_hca_tool() {
     echo "Installing hca tool (see ${LOGFILE} for errors)..."
 
-    if ! pip install --upgrade hca >> ${LOGFILE} 2>&1 ; then
+    if ! pip install hca --upgrade --ignore-installed six >> ${LOGFILE} 2>&1 ; then
         echo -e "\n\nThat failed, trying again as superuser.  You may be prompted for your password..."
-        sudo pip install --upgrade hca 2>&1 >> ${LOGFILE}
+        sudo pip install hca --upgrade --ignore-installed six 2>&1 >> ${LOGFILE}
     fi
 
     HCA=hca