Merge pull request #10 from singleplatform-eng/SPROD-7700_update_python_for_ubuntu_1804

Sprod 7700 update python for ubuntu 1804

Author: wwaltersp

.travis.yml

@@ -3,6 +3,7 @@ services: docker
 
 env:
   - distro: ubuntu1404
+  - distro: ubuntu1804
 
 script:
   # Run tests.

defaults/main.yml

@@ -28,21 +28,9 @@ python_pip_prefix: '/usr/local'
 python_pip_path: "{{python_pip_prefix}}/bin/pip{{python_major_version}}"
 python_tar_dir: "Python-{{python_version}}"
 python_tar_url: "https://www.python.org/ftp/python/{{python_version}}/{{python_tar_dir}}.tgz"
-python_dependencies:
-  - build-essential
-  - libbz2-dev
-  - libdb-dev
-  - libexpat1-dev
-  - libffi-dev
-  - libgdbm-dev
-  - liblzma-dev
-  - libncurses-dev
-  - libreadline-dev
-  - libsqlite3-dev
-  - libssl-dev
-  - python-dev
-  - tk-dev
-  - zlib1g-dev
 
 # Needed to get around restrictive umask on CIS-supplied images. Setting to Ubuntu default of 0022.
 python_pip_umask: '0022'
+python_pip_module_opts: --default-pip
+
+python_build_opts: --with-zlib-dir=/lib

meta/main.yml

@@ -8,6 +8,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - bionic
         - trusty
 
   galaxy_tags:

tasks/build_source.yml

@@ -1,5 +1,10 @@
 ---
 
+- name: Include dist dependency vars
+  include_vars:
+    file: "{{ansible_distribution_release}}.yml"
+  when: python_dependencies is not defined
+
 - name: Install dependencies
   apt: name="{{item}}" update_cache=yes cache_valid_time=86400
   with_items: "{{python_dependencies}}"
@@ -14,6 +19,6 @@
   file: path="{{python_configure_prefix}}" state=directory
 
 - name: Build python
-  shell: "./configure --prefix={{python_configure_prefix}}; make; make install"
+  shell: "./configure --prefix={{python_configure_prefix}} {{python_build_opts}}; make; make install"
   args:
     chdir: "/tmp/{{python_tar_dir}}"

tasks/install_pip.yml

@@ -2,10 +2,15 @@
 - name: Install python3-distutils
   package:
     name: python3-distutils
-  when: ansible_distribution_release == 'bionic'
+  when: ansible_distribution_major_version|int >= 16
 
-- name: Download get-pip.py
-  get_url: url=https://bootstrap.pypa.io/get-pip.py dest=/tmp/
 
-- name: Install pip
-  command: "{{python_path}} /tmp/get-pip.py"
+- name: Install Pip
+  block:
+    - name: Module Install
+      command: "{{python_path}} -m ensurepip {{python_pip_module_opts}}"
+  rescue:
+    - name: Download get-pip
+      get_url: url=https://bootstrap.pypa.io/get-pip.py dest=/tmp/
+    - name: Run get-pip
+      command: "{{python_path}} /tmp/get-pip.py"

tasks/main.yml

@@ -34,7 +34,6 @@
 # Install packages
 - name: Install virtualenv
   pip: name=virtualenv executable="{{python_pip_path}}" umask="{{python_pip_umask}}"
-  when: python_major_version == '2'
 
 - name: Install global packages
   pip: name="{{item}}" state=present executable="{{python_pip_path}}" umask="{{python_pip_umask}}"

vars/bionic.yml

@@ -0,0 +1,17 @@
+---
+python_dependencies:
+  - build-essential
+  - libbz2-1.0
+  - libc6
+  - libdb5.3
+  - libexpat1
+  - libffi6
+  - libncursesw5
+  - libreadline7
+  - libsqlite3-0
+  - libssl1.0.0
+  - libssl1.0-dev
+  - libtinfo5
+  - mime-support
+  - zlib1g
+  - zlib1g-dev

vars/trusty.yml

@@ -0,0 +1,15 @@
+python_dependencies:
+  - build-essential
+  - libbz2-dev
+  - libdb-dev
+  - libexpat1-dev
+  - libffi-dev
+  - libgdbm-dev
+  - liblzma-dev
+  - libncurses-dev
+  - libreadline-dev
+  - libsqlite3-dev
+  - libssl-dev
+  - python-dev
+  - tk-dev
+  - zlib1g-dev