From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Mon, 14 Jan 2019 21:51:50 +0000 (-0600)
Subject: Add py37 and select install py34
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F14181%2F1;p=ansible%2Froles%2Fpython-install.git

Add py37 and select install py34

Do not install py34 on Ubuntu 18.04

Change-Id: I66512d20132d33b2adc0c058d020be6b1afa2230
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---

diff --git a/defaults/main.yml b/defaults/main.yml
index b8d4d36..3d8abaf 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,7 @@
 ---
-pyenv_version: v1.2.1
+pyenv_version: v1.2.7
 python34_version: 3.4.7
 python35_version: 3.5.4
 python36_version: 3.6.4
+python37_version: 3.7.0
+pyenv_command: 'pyenv global system {{python37_version}} {{python36_version}} {{python35_version}} {{python34_version}}'
diff --git a/tasks/main.yml b/tasks/main.yml
index b27a10d..bec85bb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,6 +10,11 @@
     state: present
   become: true
 
+- name: Check pyenv global command
+  set_fact:
+    pyenv_command: 'pyenv global system {{python37_version}} {{python36_version}} {{python35_version}}'
+  when: ansible_distribution_version == '18.04'
+
 - name: Install Python via pyenv
   environment:
     PYENV_ROOT: /opt/pyenv
@@ -17,6 +22,7 @@
     PYTHON34_VERSION: '{{python34_version}}'
     PYTHON35_VERSION: '{{python35_version}}'
     PYTHON36_VERSION: '{{python36_version}}'
+    PYTHON37_VERSION: '{{python37_version}}'
   block:
     - name: 'Install pyenv {{pyenv_version}}'
       git:
@@ -30,6 +36,8 @@
       command: pyenv install -s "$PYTHON35_VERSION"
     - name: 'Install Python {{python36_version}}'
       command: pyenv install -s "$PYTHON36_VERSION"
+    - name: 'Install Python {{python37_version}}'
+      command: pyenv install -s "$PYTHON37_VERSION"
     - name: Set pyenv global
-      command: pyenv global system "$PYTHON36_VERSION" "$PYTHON35_VERSION" "$PYTHON34_VERSION"
+      command: '{{pyenv_command}}'
   become: true
diff --git a/vars/Debian.yml b/vars/Debian.yml
index c6174ce..5977b5e 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,5 +1,6 @@
 ---
 python_packages_distro:
+  - libffi-dev
   - python
   - python-dev
   - python-pip
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index da51ef1..54976e7 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,5 +1,6 @@
 ---
 python_packages_distro:
+  - libffi-devel
   - python
   - python-devel
   - python-pip