diff --git a/roles/tobiko-compile-python/defaults/main.yaml b/roles/tobiko-compile-python/defaults/main.yaml index 60d0fa8ff..5bf4aca1a 100644 --- a/roles/tobiko-compile-python/defaults/main.yaml +++ b/roles/tobiko-compile-python/defaults/main.yaml @@ -2,7 +2,7 @@ setup_python: true setup_pip: true -python_release: "3.7.5" +python_release: "3.7.7" python_version: "3.7" python_command: "python3" python_name: "Python-{{ python_release }}" @@ -32,7 +32,6 @@ yum_install_packages: - expat-devel - gdbm-devel - libffi-devel - - libpcap-devel - ncurses-devel - openssl-devel - readline-devel diff --git a/roles/tobiko-ensure-python3/defaults/main.yaml b/roles/tobiko-ensure-python3/defaults/main.yaml index d53b1672e..8a09db8c5 100644 --- a/roles/tobiko-ensure-python3/defaults/main.yaml +++ b/roles/tobiko-ensure-python3/defaults/main.yaml @@ -16,3 +16,5 @@ python_command: 'python{{ python_version }}' python_packages: {} python_info: {} + +compile_python3: no diff --git a/roles/tobiko-ensure-python3/tasks/install.yaml b/roles/tobiko-ensure-python3/tasks/install.yaml index 5a1b39153..4c94473cd 100644 --- a/roles/tobiko-ensure-python3/tasks/install.yaml +++ b/roles/tobiko-ensure-python3/tasks/install.yaml @@ -13,6 +13,12 @@ when: install_python_packages is changed +- name: "compile python 3 from sources" + include_role: name=tobiko-compile-python + when: + - compile_python3 | bool + + - name: "get '{{ python_command }}' full path" shell: | export PATH={{ python_exe_path }} diff --git a/roles/tobiko-ensure-python3/vars/RedHat-7.yaml b/roles/tobiko-ensure-python3/vars/RedHat-7.yaml index 23f078745..5c983c113 100644 --- a/roles/tobiko-ensure-python3/vars/RedHat-7.yaml +++ b/roles/tobiko-ensure-python3/vars/RedHat-7.yaml @@ -1,7 +1,3 @@ --- -python_packages: - python3: - - python3 - python3.6: - - python36 +compile_python3: yes