Skip to content

Commit

Permalink
Remove --always-copy from virtualenv and make it a param (elastic#3136)
Browse files Browse the repository at this point in the history
In elastic#3082 `--always-copy` was introduced. This caused issue on build on some operating systems. This PR reverts the change but makes `VIRTUALENV_PARAMS` a variable which can be passed to the Makefile. This allows anyone to set `--always-copy` if needed.
  • Loading branch information
ruflin authored and andrewkroh committed Dec 7, 2016
1 parent be4d86c commit 34e464a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ DOCKER_CACHE?=1 # If set to 0, all docker images are created without cache
GOPACKAGES_COMMA_SEP=$(subst $(space),$(comma),$(strip ${GOPACKAGES}))
PYTHON_ENV?=${BUILD_DIR}/python-env
BUILDID?=$(shell git rev-parse HEAD)
VIRTUALENV_PARAMS?=

CGO?=false

Expand Down Expand Up @@ -180,7 +181,7 @@ load-tests:
# Sets up the virtual python environment
.PHONY: python-env
python-env: ${ES_BEATS}/libbeat/tests/system/requirements.txt
@test -d ${PYTHON_ENV} || virtualenv --always-copy ${PYTHON_ENV}
@test -d ${PYTHON_ENV} || virtualenv ${VIRTUALENV_PARAMS} ${PYTHON_ENV}
@. ${PYTHON_ENV}/bin/activate && pip install -q --upgrade pip ; \
if [ -a ./tests/system/requirements.txt ] && [ ! ${ES_BEATS}/libbeat/tests/system/requirements.txt -ef ./tests/system/requirements.txt ] ; then \
. ${PYTHON_ENV}/bin/activate && pip install -qUr ${ES_BEATS}/libbeat/tests/system/requirements.txt -Ur ./tests/system/requirements.txt ; \
Expand Down

0 comments on commit 34e464a

Please sign in to comment.