diff --git a/build-scripts/manylinux-container-image/install-userspace-tools.sh b/build-scripts/manylinux-container-image/install-userspace-tools.sh index 3b74a767e..75a5a026b 100755 --- a/build-scripts/manylinux-container-image/install-userspace-tools.sh +++ b/build-scripts/manylinux-container-image/install-userspace-tools.sh @@ -11,13 +11,7 @@ PYTHON_INTERPRETER=/opt/python/cp39-cp39/bin/python VIRTUALENV_PYTHON_BIN="${USERSPACE_VENV_BIN_PATH}/python" VIRTUALENV_PIP_BIN="${VIRTUALENV_PYTHON_BIN} -m pip" -# NOTE: Cmake removed compatibility with `cmake < 3.5` that -# NOTE: libssh 0.9.6 is set up to require. -# NOTE: So this patch limits the version of `cmake` we install. -# -# Ref: https://github.com/eclipse-ecal/ecal/issues/2041 -# FIXME: Drop the restriction once libssh is bumped to v0.11 series. -TOOLS_PKGS="auditwheel cmake<4 --only-binary=cmake" +TOOLS_PKGS="auditwheel cmake --only-binary=cmake" # Avoid creation of __pycache__/*.py[c|o] export PYTHONDONTWRITEBYTECODE=1 diff --git a/docs/changelog-fragments/737.contrib.rst b/docs/changelog-fragments/737.contrib.rst new file mode 100644 index 000000000..dd7674f07 --- /dev/null +++ b/docs/changelog-fragments/737.contrib.rst @@ -0,0 +1,2 @@ +Reverted workaround keeping the old CMake version installed +as the new ``libssh`` works with newer versions -- by :user:`Jakuje`.