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.

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

update check for Conda env. #2295

Merged
merged 2 commits into from May 17, 2016
Merged

update check for Conda env. #2295

merged 2 commits into from May 17, 2016

Conversation

matthdsm
Copy link
Contributor

@matthdsm matthdsm commented May 3, 2016

output of python -V 2>&1 is Python 2.7.11 :: Anaconda 4.0.0 (64-bit), so grep'ing on "Continuum Analytics" wont work anymore

@nsoranzo nsoranzo added this to the 16.07 milestone May 3, 2016
@@ -9,7 +9,7 @@ for arg in "$@"; do
done

# Conda Python is in use, do not use virtualenv
if python -V 2>&1 | grep -q 'Continuum Analytics'; then
if python -V 2>&1 | grep -q 'Anaconda'; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matthdsm can we grep for both?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, I've changed and committed it.

M

Now matches both "anaconda" and "continuum analytics"
@dannon
Copy link
Member

dannon commented May 17, 2016

Thanks @matthdsm!

@dannon dannon merged commit 6fc2ae4 into galaxyproject:dev May 17, 2016
@galaxybot
Copy link
Contributor

This PR was merged without a 'kind/' tag, please correct.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants