Skip to content

Commit 16d35b5

Browse files
authored
Workaround for pypa/pip#3165 (#21)
1 parent 817e2b7 commit 16d35b5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

site/datasets/census/hca-download-census

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ function initialize() {
1818
function install_hca_tool() {
1919
echo "Installing hca tool (see ${LOGFILE} for errors)..."
2020

21-
if ! pip install --upgrade hca >> ${LOGFILE} 2>&1 ; then
21+
if ! pip install hca --upgrade --ignore-installed six >> ${LOGFILE} 2>&1 ; then
2222
echo -e "\n\nThat failed, trying again as superuser. You may be prompted for your password..."
23-
sudo pip install --upgrade hca 2>&1 >> ${LOGFILE}
23+
sudo pip install hca --upgrade --ignore-installed six 2>&1 >> ${LOGFILE}
2424
fi
2525

2626
HCA=hca

site/datasets/ischaemic-sensitivity/hca-download-ischaemic-sensitivity

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ function initialize() {
1818
function install_hca_tool() {
1919
echo "Installing hca tool (see ${LOGFILE} for errors)..."
2020

21-
if ! pip install --upgrade hca >> ${LOGFILE} 2>&1 ; then
21+
if ! pip install hca --upgrade --ignore-installed six >> ${LOGFILE} 2>&1 ; then
2222
echo -e "\n\nThat failed, trying again as superuser. You may be prompted for your password..."
23-
sudo pip install --upgrade hca 2>&1 >> ${LOGFILE}
23+
sudo pip install hca --upgrade --ignore-installed six 2>&1 >> ${LOGFILE}
2424
fi
2525

2626
HCA=hca

site/datasets/melanoma/hca-download-melanoma

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ function initialize() {
1818
function install_hca_tool() {
1919
echo "Installing hca tool (see ${LOGFILE} for errors)..."
2020

21-
if ! pip install --upgrade hca >> ${LOGFILE} 2>&1 ; then
21+
if ! pip install hca --upgrade --ignore-installed six >> ${LOGFILE} 2>&1 ; then
2222
echo -e "\n\nThat failed, trying again as superuser. You may be prompted for your password..."
23-
sudo pip install --upgrade hca 2>&1 >> ${LOGFILE}
23+
sudo pip install hca --upgrade --ignore-installed six 2>&1 >> ${LOGFILE}
2424
fi
2525

2626
HCA=hca

0 commit comments

Comments
 (0)