X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Froles%2Fpython-packages%2Ftasks%2Fmain.yml;h=372d92b2e725caee5c6bfcbfb83a175310e5b579;hb=e325a0c297f1c41fc93fb39ee27ed6c7969f4ad9;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..372d92b 100644
--- a/playbooks/roles/python-packages/tasks/main.yml
+++ b/playbooks/roles/python-packages/tasks/main.yml
@@ -1,20 +1,25 @@
-- 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',
-           'python-setuptools', 'python3-setuptools',
-           'python-gdbm', 'python-openssl', 'python3-openssl',
+    name: ['patchelf', # for auditwheel
+           'python', 'python2.7', 'python3', "{{ python_pip_pkg }}",
+           'python3-pip', 'python-setuptools', 'python3-setuptools',
+           'python-gdbm', "{{ python_openssl_pkg }}", 'python3-openssl',
+           'python-is-python2',
           ]
     state: latest
     update_cache: yes
+  vars:
+    - python_pip_pkg: "python-pip{% if ansible_facts.distribution_major_version in ['9', '10'] %}{% elif ansible_facts.distribution_major_version == '11' %}-whl{% endif %}"
+    - python_openssl_pkg: "{% if ansible_facts.distribution_major_version in ['9', '10'] %}python-openssl{% elif ansible_facts.distribution_major_version == '11' %}python3-openssl{% endif %}"
   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 +33,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