diff --git a/GNUmakefile b/GNUmakefile index 2ee86361d..71f0c18da 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -3,12 +3,6 @@ SHELL := /usr/bin/env bash VENV_DIR ?= $(CURDIR)/venv PIP ?= pip3 --disable-pip-version-check --no-input --require-virtualenv PYTHON ?= python3 -ifdef CI -PYENV ?= $(PYTHON) -else -PYENV ?= pyenv exec python -endif - PYTHON_VERSION ?= 3.8 define PIN_VERSIONS_COMMAND @@ -36,7 +30,7 @@ all: version venv: venv/.make venv/.make: rm -fr '$(VENV_DIR)' - $(PYENV) -m venv '$(VENV_DIR)' + $(PYTHON) -m venv '$(VENV_DIR)' $(PIP) install --upgrade pip touch '$(@)' diff --git a/README.rst b/README.rst index 88bb1b249..952cd9a45 100644 --- a/README.rst +++ b/README.rst @@ -661,12 +661,6 @@ and install the required software for development. Use ``make unit-tests`` and ``make test`` to execute both. You can set ``PYTEST_ARGS`` to customize the execution (e.g. ``PYTEST_ARGS=--maxfail=1 make test``). -By default ``pyenv`` is expected to be installed and in ``PATH``. This ensures -on all platforms that arbitrary Python versions can be used for development. It -is possible to overwrite this by setting ``PYENV`` to something else (e.g. -``PYENV=python3 make venv`` to simply use the global Python executable). The -default Python version is defined in ``.python-version``. - Karapace currently depends on various system software to be installed. The installation of these is automated for some operation systems, but not all. At the time of writing Java, the Protobuf Compiler, and the Snappy shared library