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.

Sign up for GitHub

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

Jump to bottom

Don't invoke setup.py directly #928

Merged
merged 1 commit into from
Mar 4, 2020
Merged

Don't invoke setup.py directly #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ SHELL = /bin/bash
# We assume an active virtualenv for development
PYENV_REGEX = .pyenv/shims
PY_BIN = python3
# https://github.com/pypa/pip/issues/5599
PIP_WRAPPER = $(PY_BIN) -m pip
PY35 = $(shell jq '.python_versions.PY35' .ci/variables.json)
PY36 = $(shell jq '.python_versions.PY36' .ci/variables.json)
PY37 = $(shell jq '.python_versions.PY37' .ci/variables.json)
Expand Down Expand Up @@ -63,10 +65,10 @@ check-venv:
fi

install: venv-create
. $(VENV_ACTIVATE_FILE); pip install --upgrade pip setuptools
. $(VENV_ACTIVATE_FILE); pip3 install -e .
. $(VENV_ACTIVATE_FILE); $(PIP_WRAPPER) install --upgrade pip setuptools wheel
. $(VENV_ACTIVATE_FILE); $(PIP_WRAPPER) install -e .
# Also install development dependencies
. $(VENV_ACTIVATE_FILE); pip3 install -e .[develop]
. $(VENV_ACTIVATE_FILE); $(PIP_WRAPPER) install -e .[develop]

clean: nondocs-clean docs-clean

Expand Down
6 changes: 4 additions & 2 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ install_esrally_with_setuptools () {
fi

if [[ ${IN_VIRTUALENV} == 0 ]]; then
python3 setup.py -q develop --user --upgrade
# https://setuptools.readthedocs.io/en/latest/setuptools.html suggests not invoking setup.py directly
# Also workaround system pip conflicts, https://github.com/pypa/pip/issues/5599
python3 -m pip install --quiet --user --upgrade --editable .[develop]
else
python3 setup.py -q develop --upgrade
python3 -m pip install --quiet --upgrade --editable .[develop]
fi
}

Expand Down