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

Conversation

Projects
None yet
6 participants
@matthdsm
Copy link
Contributor

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

@matthdsm

This comment has been minimized.

Copy link
Contributor Author

commented on 90c48ff 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

This comment has been minimized.

Copy link
@bgruening

bgruening May 12, 2016

Member

@matthdsm can we grep for both?

This comment has been minimized.

Copy link
@matthdsm

matthdsm May 17, 2016

Author Contributor

sure, I've changed and committed it.

M

changed grep statement to match 2 patterns
Now matches both "anaconda" and "continuum analytics"
@dannon

This comment has been minimized.

Copy link
Member

commented May 17, 2016

Thanks @matthdsm!

@dannon dannon merged commit 6fc2ae4 into galaxyproject:dev May 17, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@galaxybot

This comment has been minimized.

Copy link

commented May 17, 2016

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

@martenson martenson added the kind/bug label May 17, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.