From 437c4fb64b02e9b644ace13733f1c9a4935f35ff Mon Sep 17 00:00:00 2001 From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com> Date: Thu, 23 Dec 2021 13:20:24 -0500 Subject: Disable the _distutils_hack in newer setuptools (#76600) * Disable the _distutils_hack in newer setuptools. Doesn't fix the underlying issue of the venv finding the _distutils_hack of a setuptools that is not its own. ci_complete * re-throw blanket (cherry picked from commit fa617fcd7b146b110c7f932c224f838116f43a60) --- test/integration/targets/setup_paramiko/install-FreeBSD-11-python-3.yml | 2 ++ test/integration/targets/setup_paramiko/install-RedHat-8-python-3.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/integration/targets/setup_paramiko/install-FreeBSD-11-python-3.yml b/test/integration/targets/setup_paramiko/install-FreeBSD-11-python-3.yml index b8ca6c9e1d..19faeb5750 100644 --- a/test/integration/targets/setup_paramiko/install-FreeBSD-11-python-3.yml +++ b/test/integration/targets/setup_paramiko/install-FreeBSD-11-python-3.yml @@ -7,3 +7,5 @@ - name: Install Paramiko for Python 3 on FreeBSD 11 pip: # no py36-paramiko package exists for FreeBSD 11 name: paramiko + environment: + SETUPTOOLS_USE_DISTUTILS: stdlib diff --git a/test/integration/targets/setup_paramiko/install-RedHat-8-python-3.yml b/test/integration/targets/setup_paramiko/install-RedHat-8-python-3.yml index dbc0f65c59..a1f5d7a67a 100644 --- a/test/integration/targets/setup_paramiko/install-RedHat-8-python-3.yml +++ b/test/integration/targets/setup_paramiko/install-RedHat-8-python-3.yml @@ -1,3 +1,5 @@ - name: Install Paramiko for Python 3 on RHEL 8 pip: # no python3-paramiko package exists for RHEL 8 name: paramiko + environment: + SETUPTOOLS_USE_DISTUTILS: stdlib -- cgit v1.2.1