X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Froles%2Fpython-packages%2Ftasks%2Fmain.yml;h=a5449aa21809106fed0a9d3d7f7f68448d781ad0;hb=6ee766abe99c471637025e12d14653ee9f2b2ca2;hp=0abb3a1ea6a6a1d068207ca5172fc90e50b52302;hpb=821cc704535e7fb9a2aaafc5692ad68e38308786;p=ansible.git

diff --git a/playbooks/roles/python-packages/tasks/main.yml b/playbooks/roles/python-packages/tasks/main.yml
index 0abb3a1..a5449aa 100644
--- a/playbooks/roles/python-packages/tasks/main.yml
+++ b/playbooks/roles/python-packages/tasks/main.yml
@@ -1,11 +1,12 @@
-- name: Install Python and packages
+- name: Install Python and packages (Debian)
   become: true
   apt:
     autoclean: yes
     autoremove: yes
     cache_valid_time: 3600
     install_recommends: no
-    name: ['python', 'python2.7', 'python3', 'python-pip', 'python3-pip',
+    name: ['patchelf', # for auditwheel
+           'python', 'python2.7', 'python3', 'python-pip', 'python3-pip',
            'python-setuptools', 'python3-setuptools',
            'python-gdbm', 'python-openssl', 'python3-openssl',
           ]
@@ -14,7 +15,7 @@
   register: python
   when: ansible_facts.os_family == 'Debian'
 
-- name: Install Python and packages
+- name: Install Python and packages (RedHat)
   become: true
   dnf:
     name: ['python2', 'python3', 'python2-pip', 'python3-pip',
@@ -28,8 +29,20 @@
 
 - name: Upgrade Python packages
   become: true
-  shell: 'umask 022; {{ item }} -m pip install --upgrade
-      "pip < 19.1" setuptools tox virtualenv virtualenvwrapper "wheel < 0.31.1"
+  shell: 'umask 022; exec {{ item }} -m pip install --compile --upgrade
+      "pip<19.1" setuptools tox virtualenv virtualenvwrapper
       flake8 sphinx twine'
   when: python.changed
   loop: ['python3', 'python2']
+
+- name: Install wheel for Python2
+  become: true
+  shell: 'umask 022; exec python2 -m pip install --compile --upgrade
+      "wheel==0.31.1"'
+  when: python.changed
+
+- name: Install wheel and auditwheel for Python3
+  become: true
+  shell: 'umask 022; exec python3 -m pip install --compile --upgrade
+      "wheel==0.34.1" "auditwheel==3.1.0"'
+  when: python.changed