openstack/devstack
Code Issues Proposed changes

Use SETUPTOOLS_USE_DISTUTILS=stdlib for global pip installs

Browse Source 
A new setuptools release has changed the way pip installs are done,
see [0]. With this change we switch back to using the distro
method for global pip installs.

Temporarily make grenade jobs non-voting in order to allow this
patch to be backported.

[0] http://lists.openstack.org/pipermail/openstack-discuss/2020-August/016905.html

Change-Id: I5d8aa0e58e0409c54451b51de5eb70ba9a68d849
This commit is contained in:
Ian Wienand 2020-08-31 16:22:57 +10:00 committed by Jens Harbott
parent e7625fc72c
commit 18b4251bf4
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.zuul.yaml
View File

@ -705,10 +705,12 @@
voting: false voting: false
irrelevant-files: *dsvm-irrelevant-files irrelevant-files: *dsvm-irrelevant-files
- grenade: - grenade:
voting: false
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
- neutron-grenade-multinode: - neutron-grenade-multinode:
voting: false
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
@ -750,18 +752,18 @@
- devstack-multinode - devstack-multinode
- devstack-unit-tests - devstack-unit-tests
- openstack-tox-bashate - openstack-tox-bashate
- neutron-grenade-multinode: # - neutron-grenade-multinode:
irrelevant-files: # irrelevant-files:
- ^.*\.rst$ # - ^.*\.rst$
- ^doc/.*$ # - ^doc/.*$
- neutron-tempest-linuxbridge: - neutron-tempest-linuxbridge:
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$
- grenade: # - grenade:
irrelevant-files: # irrelevant-files:
- ^.*\.rst$ # - ^.*\.rst$
- ^doc/.*$ # - ^doc/.*$
- openstacksdk-functional-devstack: - openstacksdk-functional-devstack:
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$

8
inc/python
View File

@ -170,7 +170,13 @@ function pip_install {
local sudo_pip="env" local sudo_pip="env"
else else
local cmd_pip="python$PYTHON3_VERSION -m pip" local cmd_pip="python$PYTHON3_VERSION -m pip"
local sudo_pip="sudo -H LC_ALL=en_US.UTF-8" # 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 "
echo "Using python $PYTHON3_VERSION to install $package_dir" echo "Using python $PYTHON3_VERSION to install $package_dir"
fi fi