Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX ice is now picked up globally and not locally #323

Merged
merged 10 commits into from
Mar 25, 2020
Merged

FIX ice is now picked up globally and not locally #323

merged 10 commits into from
Mar 25, 2020

Conversation

NelleV
Copy link
Contributor

@NelleV NelleV commented Mar 25, 2020

The following lines caused a problem when the user upgraded iced outside of HiC-pro. HiC-pro was still using the ice script corresponding to an old version of the iced python package. The following change "just" rely on using the installed version of ice in the user's path rather than on a local version provided by HiC-pro. As a result the ice script used is always the one that is associated with the iced package installed.

@NelleV
Copy link
Contributor Author

NelleV commented Mar 25, 2020

This PR is against master. Let me know if I should use devel instead.

@nservant
Copy link
Owner

Hi Nelle,
Does it mean that I can remove the ice script from HiC-Pro scripts folder ?

@NelleV
Copy link
Contributor Author

NelleV commented Mar 25, 2020

Yes : I'll update the installation procedure as well.

@NelleV
MAINT updating the iced installation.
2e97fae 
There is no need to copy scripts/ice. The python package installs
it on its own
@NelleV
Copy link
Contributor Author

NelleV commented Mar 25, 2020

Are tests being ran automatically? I thought a while back you had set up travis. If it's not the case, we should probably do that.

@nservant
Copy link
Owner

ok. Note that we will release a new version in the coming days (with python3 support) which does not install iced anymore but just ask it as a per-requisite

@nservant
Copy link
Owner

no continuous integration is not done so far ... but indeed it would be good

@NelleV
Copy link
Contributor Author

NelleV commented Mar 25, 2020

That's awesome! That would solve the issue we have on our server!

@nservant
Copy link
Owner

ok. I will merge and include the change in the verison I just release to avoir confusion ...
it's ok for you ?

@nservant nservant changed the base branch from master to devel March 25, 2020 13:03
@nservant nservant merged commit 88c0452 into nservant:devel Mar 25, 2020
@NelleV
Copy link
Contributor Author

NelleV commented Mar 25, 2020

Sounds good to me!

@NelleV NelleV deleted the fix_ex branch March 25, 2020 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NelleV @nservant @rakarnik @atongsa