Skip to content

Commit 80758e6

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Always install python3 and its dev package"
2 parents 64b3c5f + 78cf6f6 commit 80758e6

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

inc/python

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,8 @@ function install_python3 {
456456
apt_get install python${PYTHON3_VERSION} python${PYTHON3_VERSION}-dev
457457
elif is_suse; then
458458
install_package python3-devel python3-dbm
459+
elif is_fedora; then
460+
install_package python3 python3-devel
459461
fi
460462
}
461463

stack.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,11 @@ fi
415415

416416
# Ensure python is installed
417417
# --------------------------
418-
is_package_installed python || install_package python
418+
install_python3
419419

420+
if ! python3_enabled; then
421+
is_package_installed python || install_package python
422+
fi
420423

421424
# Configure Logging
422425
# -----------------

stackrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export USE_PYTHON3=$(trueorfalse True USE_PYTHON3)
142142
# version of Python 3 to this variable will install the app using that
143143
# version of the interpreter instead of 2.7.
144144
_DEFAULT_PYTHON3_VERSION="$(_get_python_version python3)"
145-
export PYTHON3_VERSION=${PYTHON3_VERSION:-${_DEFAULT_PYTHON3_VERSION:-3.5}}
145+
export PYTHON3_VERSION=${PYTHON3_VERSION:-${_DEFAULT_PYTHON3_VERSION:-3.6}}
146146

147147
# Just to be more explicit on the Python 2 version to use.
148148
_DEFAULT_PYTHON2_VERSION="$(_get_python_version python2)"

0 commit comments

Comments
 (0)