Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .ci/variables.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"prerequisite_versions": {
"PIP": "22.2",
"SETUPTOOLS": "63.2.0",
"WHEEL": "0.37.1"
},
"python_versions": {
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export PY38 = $(shell jq -r '.python_versions.PY38' .ci/variables.json)
export PY39 = $(shell jq -r '.python_versions.PY39' .ci/variables.json)
export PY310 = $(shell jq -r '.python_versions.PY310' .ci/variables.json)
export PIP_VERSION = $(shell jq -r '.prerequisite_versions.PIP' .ci/variables.json)
export SETUPTOOLS_VERSION = $(shell jq -r '.prerequisite_versions.SETUPTOOLS' .ci/variables.json)
export WHEEL_VERSION = $(shell jq -r '.prerequisite_versions.WHEEL' .ci/variables.json)
VIRTUAL_ENV ?= .venv
VENV_ACTIVATE_FILE = $(VIRTUAL_ENV)/bin/activate
Expand Down Expand Up @@ -60,7 +59,7 @@ check-venv:
fi

install-user: venv-create
. $(VENV_ACTIVATE_FILE); $(PIP_WRAPPER) install --upgrade pip==$(PIP_VERSION) setuptools==$(SETUPTOOLS_VERSION) wheel==$(WHEEL_VERSION)
. $(VENV_ACTIVATE_FILE); $(PIP_WRAPPER) install --upgrade pip==$(PIP_VERSION) wheel==$(WHEEL_VERSION)
. $(VENV_ACTIVATE_FILE); $(PIP_WRAPPER) install -e .

install: install-user
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfiles/Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ WORKDIR /rally
# Wipe away any lingering caches, copied over from the local machine
RUN find /rally -name "__pycache__" -exec rm -rf -- \{\} \; 2>/dev/null || true
RUN find /rally -name ".pyc" -exec rm -rf -- \{\} \; 2>/dev/null || true
RUN pip3 install --upgrade pip setuptools wheel
RUN pip3 install --upgrade pip wheel
RUN pip3 install /rally

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfiles/Dockerfile-release
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt-get -y update && \
RUN groupadd --gid 1000 rally && \
useradd -d /rally -m -k /dev/null -g 1000 -N -u 1000 -l -s /bin/bash rally

RUN pip3 install --upgrade pip setuptools wheel
RUN pip3 install --upgrade pip wheel
RUN pip3 install esrally==$RALLY_VERSION

WORKDIR /rally
Expand Down
15 changes: 7 additions & 8 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@
readonly BINARY_NAME="${__RALLY_INTERNAL_BINARY_NAME}"
readonly HUMAN_NAME="${__RALLY_INTERNAL_HUMAN_NAME}"

install_esrally_with_setuptools () {
install_esrally() {
# Check if optional parameter with Rally binary path, points to an existing executable file.
if [[ $# -ge 1 && -n $1 ]]; then
if [[ -f $1 && -x $1 ]]; then return; fi
fi

if [[ ${IN_VIRTUALENV} == 0 ]]; then
# 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 --no-use-pep517 --editable .[develop]
# Workaround system pip conflicts, see https://github.com/pypa/pip/issues/5599
python3 -m pip install --quiet --user --upgrade --editable .[develop]
else
python3 -m pip install --quiet --upgrade --no-use-pep517 --editable .[develop]
python3 -m pip install --quiet --upgrade --editable .[develop]
fi
}

Expand Down Expand Up @@ -99,7 +98,7 @@ then
then
echo "Auto-updating Rally from ${REMOTE}"
git rebase ${REMOTE}/master --quiet
install_esrally_with_setuptools
install_esrally
#else
# offline - skipping update
fi
Expand All @@ -125,14 +124,14 @@ if [[ $IN_VIRTUALENV == 0 ]]
then
RALLY_ROOT=$(python3 -c "import site; print(site.USER_BASE)")
RALLY_BIN=${RALLY_ROOT}/bin/${BINARY_NAME}
install_esrally_with_setuptools "${RALLY_BIN}"
install_esrally "${RALLY_BIN}"
if [[ -x $RALLY_BIN ]]; then
${RALLY_BIN} "$@"
else
echo "Cannot execute ${HUMAN_NAME} in ${RALLY_BIN}."
fi
else
install_esrally_with_setuptools "${BINARY_NAME}"
install_esrally "${BINARY_NAME}"

${BINARY_NAME} "$@"
fi
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#
###############################################################################
[tox]
isolated_build = True
envlist =
py{38,39,310}-unit
py{38,39,310}-it
Expand Down