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

Merge "Fix pip-and-virtualenv to work with python3"

Browse Source
This commit is contained in:
Jenkins 2016-12-14 07:18:32 +00:00 committed by Gerrit Code Review
commit 5a64c9e9cf
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/pip-and-virtualenv/element-deps
View File

@ -1,3 +1,4 @@
dib-python
install-types install-types
package-installs package-installs
source-repositories source-repositories

4
elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/10-install-pip
View File

@ -19,7 +19,7 @@ if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
${YUM:-yum} install -y python-virtualenv python-pip python-setuptools ${YUM:-yum} install -y python-virtualenv python-pip python-setuptools
# install pip; this overwrites packaged pip # install pip; this overwrites packaged pip
python /tmp/get-pip.py /usr/local/bin/dib-python /tmp/get-pip.py
# pip and setuptools are closely related; we want to ensure the # pip and setuptools are closely related; we want to ensure the
# latest for sanity. Because distro packages don't include enough # latest for sanity. Because distro packages don't include enough
@ -50,6 +50,6 @@ if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
fi fi
echo "exclude=python-virtualenv,python-pip,python-setuptools" >> ${conf} echo "exclude=python-virtualenv,python-pip,python-setuptools" >> ${conf}
else else
python /tmp/get-pip.py /usr/local/bin/dib-python /tmp/get-pip.py
pip install virtualenv pip install virtualenv
fi fi

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

@ -2,7 +2,22 @@
# early enough because pip depends on it. # early enough because pip depends on it.
python-xml: python-xml:
phase: pre-install.d phase: pre-install.d
dib_python_version: 2
python-pip: python-pip:
installtype: package installtype: package
dib_python_version: 2
python3-pip:
installtype: package
dib_python_version: 3
python-virtualenv: python-virtualenv:
installtype: package installtype: package
dib_python_version: 2
python3-virtualenv:
installtype: package
dib_python_version: 3
python-dev:
installtype: source
dib_python_version: 2
python3-dev:
installtype: source
dib_python_version: 3

13
elements/pip-and-virtualenv/pkg-map
View File

@ -2,10 +2,17 @@
"family": { "family": {
"gentoo": { "gentoo": {
"python-pip": "dev-python/pip", "python-pip": "dev-python/pip",
"python-virtualenv": "dev-python/virtualenv" "python-virtualenv": "dev-python/virtualenv",
"python3-dev": "dev-lang/python"
}, },
"suse" : { "suse": {
"python-xml": "python-xml" "python-xml": "python-xml",
"python2-dev": "python2-devel",
"python3-dev": "python3-devel"
},
"redhat": {
"python2-dev": "python2-devel",
"python3-dev": "python3-devel"
} }
}, },
"default": { "default": {