diff --git a/.gitignore b/.gitignore index 3a77206..c46a9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ logs/* # OS generated files # ###################### ._* +.ansible .tox *.egg-info .eggs diff --git a/defaults/main.yml b/defaults/main.yml index 03ba768..c94aa32 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -112,12 +112,12 @@ venv_python_executable: "python3" # Under normal circumstances, the installs will be done # into the existing venv over the top of any previously # installed packages. -venv_rebuild: no +venv_rebuild: false # Enable the recreation of the pre-built wheels. # This is useful if wheels build has been interrupted or # previously failed because of connectivity or other issues. -venv_wheels_rebuild: no +venv_wheels_rebuild: false # Enable/disable the build of python wheels # If the package concerned is built from a tarball, rather diff --git a/examples/playbook.yml b/examples/playbook.yml index 5ff5b9a..693995f 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -21,4 +21,4 @@ venv_facts_when_changed: - section: "service" option: "need_service_restart" - value: True + value: true diff --git a/tasks/main.yml b/tasks/main.yml index 2c87878..8a195ac 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -30,7 +30,7 @@ - name: Gather build target facts setup: - gather_subset: '!all:min' + gather_subset: "!all:min" delegate_to: "{{ item }}" delegate_facts: true # NOTE(noonedeadpunk): failed_when is used instead of ignore_errors as latter diff --git a/tasks/python_venv_install_symlink.yml b/tasks/python_venv_install_symlink.yml index 82ab2a9..5d331e2 100644 --- a/tasks/python_venv_install_symlink.yml +++ b/tasks/python_venv_install_symlink.yml @@ -18,7 +18,7 @@ paths: "{{ venv_install_destination_path }}/lib/" patterns: "python*" file_type: directory - recurse: no + recurse: false register: _python_venv_details - name: Search for lib files to link @@ -45,5 +45,5 @@ src: "{{ item }}" dest: "{{ _venv_python_lib_folder }}/site-packages/{{ item | basename }}" state: link - force: yes + force: true with_items: "{{ _python_files.stdout_lines }}" diff --git a/tasks/python_venv_wheel_build.yml b/tasks/python_venv_wheel_build.yml index 3316cbf..10ba8d3 100644 --- a/tasks/python_venv_wheel_build.yml +++ b/tasks/python_venv_wheel_build.yml @@ -143,7 +143,7 @@ owner: "{{ venv_build_host_user_name | default(omit) }}" group: "{{ venv_build_host_group_name | default(omit) }}" state: directory - recurse: yes + recurse: true when: - (venv_build_host_user_name is defined) or (venv_build_host_group_name is defined) diff --git a/vars/debian.yml b/vars/debian.yml index 0aeb247..e83f03b 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -14,15 +14,15 @@ # limitations under the License. _venv_build_base_distro_package_list: - - cmake - - g++ - - python3-pkgconfig - - python3-dev - - python3-venv - - python3-setuptools + - cmake + - g++ + - python3-pkgconfig + - python3-dev + - python3-venv + - python3-setuptools _venv_install_base_distro_package_list: - - python3-venv - - python3-setuptools + - python3-venv + - python3-setuptools _venv_install_ca_bundle_path: /etc/ssl/certs/ca-certificates.crt diff --git a/vars/main.yml b/vars/main.yml index 5e60552..0019bed 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -87,7 +87,6 @@ _venv_wheels_first_play_hosts: |- _venv_pip_packages: "{{ (venv_default_pip_packages | union(venv_pip_packages)) | sort | select | list }}" - _venv_build_dist: >- {{ (ansible_facts['distribution'] | lower == 'ubuntu') | ternary( ansible_facts['distribution_version'].split('.')[:2] | join('.'), diff --git a/vars/redhat-8.yml b/vars/redhat-8.yml index 69bdf50..9ef149e 100644 --- a/vars/redhat-8.yml +++ b/vars/redhat-8.yml @@ -14,10 +14,10 @@ # limitations under the License. _venv_build_base_distro_package_list: - - autoconf - - cmake - - gcc - - gcc-c++ - - python36-devel + - autoconf + - cmake + - gcc + - gcc-c++ + - python36-devel _venv_install_base_distro_package_list: [] diff --git a/vars/redhat-9.yml b/vars/redhat-9.yml index 4b5bdd3..c500213 100644 --- a/vars/redhat-9.yml +++ b/vars/redhat-9.yml @@ -14,11 +14,11 @@ # limitations under the License. _venv_build_base_distro_package_list: - - autoconf - - cmake - - gcc - - gcc-c++ - - python3-devel + - autoconf + - cmake + - gcc + - gcc-c++ + - python3-devel _venv_install_base_distro_package_list: []