sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "pip-and-virtualenv: Install python3 on openSUSE"

Browse Source
This commit is contained in:
Jenkins 2017-07-11 08:11:16 +00:00 committed by Gerrit Code Review
commit 0327d775f1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
diskimage_builder/elements/pip-and-virtualenv/package-installs.yaml
View File

@ -1,8 +1,18 @@
# This package is only valid for SUSE and we need to pull it in # The python-xml and python3 openSUSE packages contain core python modules
# early enough because pip depends on it. # such as the XML one but the python devel packages do not pull them. As
# such we need to install them during the pre-install.d phase so they are
# available as early as possible. See
# - https://bugzilla.suse.com/show_bug.cgi?id=1046990
# - https://review.openstack.org/#/c/478648/
# - https://review.openstack.org/#/c/478650/
# for discussions about this issue.
python-xml: python-xml:
phase: pre-install.d phase: pre-install.d
dib_python_version: 2 dib_python_version: 2
python3:
phase: pre-install.d
installtype: package
dib_python_version: 3
python-pip: python-pip:
installtype: package installtype: package
dib_python_version: 2 dib_python_version: 2

6
diskimage_builder/elements/pip-and-virtualenv/pkg-map
View File

@ -11,7 +11,8 @@
"suse": { "suse": {
"python-xml": "python-xml", "python-xml": "python-xml",
"python-dev": "python-devel", "python-dev": "python-devel",
"python3-dev": "python3-devel" "python3-dev": "python3-devel",
"python3": "python3"
}, },
"redhat": { "redhat": {
"python-dev": "python2-devel", "python-dev": "python2-devel",
@ -19,6 +20,7 @@
} }
}, },
"default": { "default": {
"python-xml": "" "python-xml": "",
"python3": ""
} }
} }