Browse code
Fix six package on opensuse for pip 10
openSUE Leap 15.0 and 15.1 both provide python3-six version 1.11.0.
Since version 1.12.0 was released, pip>=10 recognizes the version
difference and tries to uninstall the distro-provided version and fails.
This change adds another hack to remove the egg-info file for the six
library so that pip can manage it directly. We also have to wait to
install os-testr until after the fixup has happened since trying to
install it triggers the issue.
Change-Id: I4649abe06b5893a5251bfcdd4234abccde6ceda2
Colleen Murphy authored on 2019/09/26 04:51:23Showing 2 changed files
| ... | ... |
@@ -796,9 +796,6 @@ if [[ "$OFFLINE" != "True" ]]; then |
| 796 | 796 |
PYPI_ALTERNATIVE_URL=${PYPI_ALTERNATIVE_URL:-""} $TOP_DIR/tools/install_pip.sh
|
| 797 | 797 |
fi |
| 798 | 798 |
|
| 799 |
-# Install subunit for the subunit output stream |
|
| 800 |
-pip_install -U os-testr |
|
| 801 |
- |
|
| 802 | 799 |
TRACK_DEPENDS=${TRACK_DEPENDS:-False}
|
| 803 | 800 |
|
| 804 | 801 |
# Install Python packages into a virtualenv so that we can track them |
| ... | ... |
@@ -816,6 +813,9 @@ fi |
| 816 | 816 |
source $TOP_DIR/tools/fixup_stuff.sh |
| 817 | 817 |
fixup_all |
| 818 | 818 |
|
| 819 |
+# Install subunit for the subunit output stream |
|
| 820 |
+pip_install -U os-testr |
|
| 821 |
+ |
|
| 819 | 822 |
if [[ "$USE_SYSTEMD" == "True" ]]; then |
| 820 | 823 |
pip_install_gr systemd-python |
| 821 | 824 |
# the default rate limit of 1000 messages / 30 seconds is not |
| ... | ... |
@@ -256,6 +256,7 @@ function fixup_suse {
|
| 256 | 256 |
# overwriting works. So this hacks around those packages that |
| 257 | 257 |
# have been dragged in by some other system dependency |
| 258 | 258 |
sudo rm -rf /usr/lib/python3.6/site-packages/ply-*.egg-info |
| 259 |
+ sudo rm -rf /usr/lib/python3.6/site-packages/six-*.egg-info |
|
| 259 | 260 |
} |
| 260 | 261 |
|
| 261 | 262 |
# The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has |