Fix venv detection with venv and Rally execution on non master #449
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes two issues. Firstly, let `./rally` start when executed for the first time with self update disabled (e.g. from a non master branch in a fork) by ensuring the `esrally` binary has been installed with setuptools. Secondly, fix virtualenv detection when pyenv is in use. On some configurations when pyenv is present, creating a Python3 virtualenv uses pyvenv instead of Python3's own virtualenv[1] which fails the current check for a virtualenv in the `run.sh` script. [1] https://legacy.python.org/dev/peps/pep-0405/ Closes elastic#447 Closes elastic#448
dliappis
added
bug
danielmitterdorfer
approved these changes
Apr 3, 2018
| function install_esrally_with_setuptools() { | ||
| # Check if optional parameter with Rally binary path, points to an existing executable file. | ||
| if [[ -n $1 ]]; then | ||
| if [[ -f $1 && -x $1 ]]; then return; fi |
There was a problem hiding this comment.
Do we need to enclose the parameter in double quotes to avoid issues with spaces in path names? (i.e. "${1}"?)
There was a problem hiding this comment.
Double quotes are needed only for the backwards compatible [. Double square braces do not require double quoting for the variables.
run.sh
Outdated
| # Attempt to update Rally itself by default but allow user to skip it. | ||
| SELF_UPDATE=YES | ||
| # Assume that the "main remote" is called "origin" | ||
| REMOTE="origin" | ||
|
|
||
| # While we could also check via the presence of `VIRTUAL_ENV` this is a bit more reliable. | ||
| python3 -c 'import sys; print(sys.real_prefix)' >/dev/null 2>&1 && IN_VIRTUALENV=1 || IN_VIRTUALENV=0 | ||
| # Check for both pyvenv and normal venv environments | ||
| # https://legacy.python.org/dev/peps/pep-0405/ |
There was a problem hiding this comment.
Is there a reason why you linked to the legacy site instead of https://www.python.org/dev/peps/pep-0405/?
run.sh
Outdated
| python3 -c 'import sys; print(sys.real_prefix)' >/dev/null 2>&1 && IN_VIRTUALENV=1 || IN_VIRTUALENV=0 | ||
| # Check for both pyvenv and normal venv environments | ||
| # https://legacy.python.org/dev/peps/pep-0405/ | ||
| if python3 -c 'import sys; sys.exit(0) if ".pyenv" in sys.base_prefix else exit(0) if hasattr(sys,"real_path") else exit(1)' >/dev/null 2>&1 |
There was a problem hiding this comment.
I think the following would be a bit simpler?
import sys; exit(0) if ".pyenv" in sys.base_prefix or hasattr(sys,"real_path") else exit(1)There was a problem hiding this comment.
Changing the logic entirely here as per our discussion.
danielmitterdorfer
approved these changes
Apr 3, 2018
danielmitterdorfer
added a commit
that referenced
this pull request
Apr 3, 2018
With this commit we use the syntax `function X` instead of `function X()` which is more compatible and also works with older bash versions (such as the one on MacOS). See also the [GNU bash docs on shell functions](https://www.gnu.org/software/bash/manual/bash.html#Shell-Functions). Relates #449
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes two issues. Firstly, let
./rallystart whenexecuted for the first time with self update disabled (e.g. from a non
master branch in a fork) by ensuring the
esrallybinary has beeninstalled with setuptools.
Secondly, fix virtualenv detection when pyenv is in use. On some
configurations when pyenv is present, creating a Python3 virtualenv
uses pyvenv instead of Python3's own virtualenv[1] which fails the
current check for a virtualenv in the
run.shscript.[1] https://legacy.python.org/dev/peps/pep-0405/
Closes #447
Closes #448