Skip to content

Commit

Permalink
Corrected dependency incompatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
lingfeiwang committed May 4, 2023
1 parent 3c6c699 commit 1d63f80
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
ref:
description: 'Commit or branch to run action on'
required: true
default: 'dev2'
default: 'dev'

jobs:
install-script-bash:
Expand Down
11 changes: 4 additions & 7 deletions doc/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,13 @@ if [ "a$STEPS" == "a" ] || [ "a$(( STEPS & 1 ))" != "a0" ]; then
. activate $CONDAENV_NAME
fi
if [ "a$STEPS" == "a" ] || [ "a$(( STEPS & 2 ))" != "a0" ]; then
#Install Dictys
#Install Dictys and pyDNase with correct matplotlib
if [ "a$LOCAL_VERSION" == "a" ]; then
pip install $PIP_OPTIONS git+https://github.com/pinellolab/dictys.git@$COMMIT_VERSION
pip install $PIP_OPTIONS --no-deps pyDNase git+https://github.com/pinellolab/dictys.git@$COMMIT_VERSION
else
pip install $PIP_OPTIONS "$LOCAL_VERSION"
pip install $PIP_OPTIONS --no-deps pyDNase "$LOCAL_VERSION"
fi
#Correcting matplotlib version due to pyDNase dependency
pip uninstall -y pyDNase
pip install -U matplotlib
pip install $PIP_OPTIONS --no-deps pyDNase
pip install $PIP_OPTIONS $(pip check | grep ', which is not installed[.]$' | awk -F ',' '{print $(NF-1)}' | awk '{print $NF}' | grep -vi '^pyDNase$')
fi
if [ "a$STEPS" == "a" ] || [ "a$(( STEPS & 4 ))" != "a0" ]; then
#Update homer
Expand Down

0 comments on commit 1d63f80

Please sign in to comment.