@@ -99,7 +99,8 @@ quiet_cmd_pyinstall = INSTALL $2
9999quiet_cmd_pyenvinstall = PYENV install $2
100100 cmd_pyenvinstall = \
101101 if ! cat $(PY_ENV)/requirements.sha256 2>/dev/null | sha256sum --check --status 2>/dev/null; then \
102− $(PY_ENV_BIN)/python -m pip $(PIP_VERBOSE) install -e $2$(PY_SETUP_EXTRAS) ;\
102+ rm -f $(PY_ENV)/requirements.sha256; \
103+ $(PY_ENV_BIN)/python -m pip $(PIP_VERBOSE) install -e $2$(PY_SETUP_EXTRAS) &&\
103104 sha256sum requirements*.txt > $(PY_ENV)/requirements.sha256 ;\
104105 else \
105106 echo "PYENV $2 already installed"; \
@@ -119,13 +120,13 @@ quiet_cmd_pyenvuninstall = PYENV uninstall $2
119120# $2 path to folder where virtualenv take place
120121quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate
121122 cmd_virtualenv = \
122− if [ ! -d "./$(PY_ENV)" ];then \
123− $(PYTHON) -m venv $(VTENV_OPTS) $2; \
123+ if [ -d "./$(PY_ENV)" -a -x "./$(PY_ENV_BIN)/python" ]; then \
124+ echo "PYENV using virtualenv from $2"; \
125+ else \
126+ $(PYTHON) -m venv $(VTENV_OPTS) $2; \
124127 $(PY_ENV_BIN)/python -m pip install $(PIP_VERBOSE) -U pip wheel setuptools; \
125− $(PY_ENV_BIN)/python -m pip install $(PIP_VERBOSE) -r requirements.txt; \
126− else \
127− echo "PYENV using virtualenv from $2"; \
128− fi
128+ $(PY_ENV_BIN)/python -m pip install $(PIP_VERBOSE) -r requirements.txt; \
129+ fi
129130
130131# $2 path to lint
131132quiet_cmd_pylint = LINT $@