Revert "Use SETUPTOOLS_USE_DISTUTILS=stdlib for global pip installs"
This partially reverts commit 18b4251bf4f689923a19bf7fbc50d5c2ea422b21.
Support for loading distutils from the standard library is now deprecated
since v70.3.0 [1]. It was needed initially to ease the transition and
can be removed now.
[1] https://setuptools.pypa.io/en/latest/history.html#v70-3-0
Change-Id: Ib929219ae81b802a4632963ef71a258edf4deee5
diff --git a/inc/python b/inc/python
index 2083b74..c94e5a4 100644
--- a/inc/python
+++ b/inc/python
@@ -199,13 +199,7 @@
echo "Using python $PYTHON3_VERSION to install $package_dir"
else
local cmd_pip="python$PYTHON3_VERSION -m pip"
- # See
- # https://github.com/pypa/setuptools/issues/2232
- # http://lists.openstack.org/pipermail/openstack-discuss/2020-August/016905.html
- # this makes setuptools >=50 use the platform distutils.
- # We only want to do this on global pip installs, not if
- # installing in a virtualenv
- local sudo_pip="sudo -H LC_ALL=en_US.UTF-8 SETUPTOOLS_USE_DISTUTILS=stdlib "
+ local sudo_pip="sudo -H LC_ALL=en_US.UTF-8"
echo "Using python $PYTHON3_VERSION to install $package_dir"
fi