Use get-pip.py instead of ez_setup.py

Because this method is DEPRECATED. Check pypa/setuptools#581 for more details.
Oefenweb · Mar 13, 2017 · ef132f7 · ef132f7
1 parent 8c0a014
commit ef132f7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/Oefenweb/ansible-pip.svg?branch=master)](https://travis-ci.org/Oefenweb/ansible-pip) [![Ansible Galaxy](http://img.shields.io/badge/ansible--galaxy-pip-blue.svg)](https://galaxy.ansible.com/tersmitten/pip)
 
-Set up (the latest version of) [pip](https://pypi.python.org/pypi/pip) and [setuptools](https://pypi.python.org/pypi/setuptools) in Debian-like systems.
+Set up (the latest version of) [pip](https://pypi.python.org/pypi/pip), [wheel](https://packaging.python.org/key_projects/#wheel) and [setuptools](https://packaging.python.org/key_projects/#setuptools) in Debian-like systems.
 
 #### Requirements
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,3 +1,2 @@
 # defaults file for pip
 ---
-pip_self_update: true
diff --git a/meta/main.yml b/meta/main.yml
@@ -3,7 +3,7 @@
 galaxy_info:
   author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
-  description: Set up (the latest version of) pip and setuptools in Debian-like systems
+  description: Set up (the latest version of) pip, setuptools and wheel in Debian-like systems
   license: MIT
   min_ansible_version: 1.9.6
   platforms:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -24,14 +24,20 @@
     - pip
     - pip-directory
 
-- include: setuptools.yml
+- name: download (latest) pip
+  get_url:
+    url: "{{ pip_download_url }}"
+    dest: "{{ pip_download_path }}/{{ pip_download_url | basename }}"
+    owner: root
+    group: root
+    mode: 0644
+    force: true
+  register: _download_latest
   tags:
-    - configuration
-    - pip
-    - pip-setuptools
+    - pip-pip-download
 
-- include: pip.yml
+- name: install (latest) pip (setuptools and wheel)
+  command: python {{ _download_latest.dest }}
+  when: _download_latest | changed
   tags:
-    - configuration
-    - pip
-    - pip-pip
+    - pip-pip-install
diff --git a/tasks/pip.yml b/tasks/pip.yml
diff --git a/tasks/setuptools.yml b/tasks/setuptools.yml
diff --git a/vars/main.yml b/vars/main.yml
@@ -6,4 +6,4 @@ pip_dependencies:
   - curl
 
 pip_download_path: /var/lib/ansible/pip/downloads
-pip_download_url: https://bootstrap.pypa.io/ez_setup.py
+pip_download_url: https://bootstrap.pypa.io/get-pip.py