Merge pull request #1248 from rallytime/py3-u18

Add python 3 support for Ubuntu 18
This commit is contained in:
Nicole Thomas 2018-06-19 12:05:42 -04:00 committed by GitHub
commit fe9962dc80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View file

@ -333,6 +333,7 @@ this offering, while limited, is as follows:
- CentOS 7
- Debian 9
- Ubuntu 16.04
- Ubuntu 18.04
Installing the Python 3 packages for Salt is done via the ``-x`` option:

View file

@ -2774,6 +2774,8 @@ install_ubuntu_git_deps() {
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
PY_PKG_VER=3
__PACKAGES="${__PACKAGES} python3-setuptools"
else
PY_PKG_VER=""