Merge pull request #2418 from return42/fix-pyenv-install

Browse Source 
[fix] makefile.python: remove duplicate pyenv-(un)install targets
This commit is contained in:
Alexandre Flament 2020-12-24 10:23:09 +01:00 committed by GitHub
commit 2fc2d17a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/makefile.python
View File

@ -220,16 +220,8 @@ PHONY += pydebug
pydebug: $(PY_ENV) pydebug: $(PY_ENV)
DEBUG=$(DEBUG) $(PY_ENV_BIN)/pytest $(DEBUG) -v $(TEST_FOLDER)/$(TEST) DEBUG=$(DEBUG) $(PY_ENV_BIN)/pytest $(DEBUG) -v $(TEST_FOLDER)/$(TEST)
# install / uninstall python objects into virtualenv (PYENV)
pyenv-install: $(PY_ENV)
@$(PY_ENV_BIN)/python -m pip $(PIP_VERBOSE) install -e .
@echo "ACTIVATE $(call normpath,$(PY_ENV_ACT)) "
pyenv-uninstall: $(PY_ENV)
@$(PY_ENV_BIN)/python -m pip $(PIP_VERBOSE) uninstall --yes .
# runs python interpreter from ./local/py<N>/bin/python # runs python interpreter from ./local/py<N>/bin/python
pyenv-python: pyenv-install pyenv-python: pyenvinstall
$(PY_ENV_BIN)/python -i $(PY_ENV_BIN)/python -i
# With 'dependency_links=' setuptools supports dependencies on packages hosted # With 'dependency_links=' setuptools supports dependencies on packages hosted