Skip to content

Commit 18b4251

Browse files
ianwjharbott
authored andcommitted
Use SETUPTOOLS_USE_DISTUTILS=stdlib for global pip installs
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
1 parent e7625fc commit 18b4251

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

.zuul.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -705,10 +705,12 @@
705705
voting: false
706706
irrelevant-files: *dsvm-irrelevant-files
707707
- grenade:
708+
voting: false
708709
irrelevant-files:
709710
- ^.*\.rst$
710711
- ^doc/.*$
711712
- neutron-grenade-multinode:
713+
voting: false
712714
irrelevant-files:
713715
- ^.*\.rst$
714716
- ^doc/.*$
@@ -750,18 +752,18 @@
750752
- devstack-multinode
751753
- devstack-unit-tests
752754
- openstack-tox-bashate
753-
- neutron-grenade-multinode:
754-
irrelevant-files:
755-
- ^.*\.rst$
756-
- ^doc/.*$
755+
# - neutron-grenade-multinode:
756+
# irrelevant-files:
757+
# - ^.*\.rst$
758+
# - ^doc/.*$
757759
- neutron-tempest-linuxbridge:
758760
irrelevant-files:
759761
- ^.*\.rst$
760762
- ^doc/.*$
761-
- grenade:
762-
irrelevant-files:
763-
- ^.*\.rst$
764-
- ^doc/.*$
763+
# - grenade:
764+
# irrelevant-files:
765+
# - ^.*\.rst$
766+
# - ^doc/.*$
765767
- openstacksdk-functional-devstack:
766768
irrelevant-files:
767769
- ^.*\.rst$

inc/python

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,13 @@ function pip_install {
170170
local sudo_pip="env"
171171
else
172172
local cmd_pip="python$PYTHON3_VERSION -m pip"
173-
local sudo_pip="sudo -H LC_ALL=en_US.UTF-8"
173+
# See
174+
# https://github.com/pypa/setuptools/issues/2232
175+
# http://lists.openstack.org/pipermail/openstack-discuss/2020-August/016905.html
176+
# this makes setuptools >=50 use the platform distutils.
177+
# We only want to do this on global pip installs, not if
178+
# installing in a virtualenv
179+
local sudo_pip="sudo -H LC_ALL=en_US.UTF-8 SETUPTOOLS_USE_DISTUTILS=stdlib "
174180
echo "Using python $PYTHON3_VERSION to install $package_dir"
175181
fi
176182

0 commit comments

Comments
 (0)