From 4715b470f9fa220cbd5811067ac7e1bfbf2d565f Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 7 Feb 2023 18:34:57 +0100 Subject: [PATCH] Always build wheels by default Due to some corner cases that are possible with currnet logic, it was decided to simply it and always build wheel regardless of host count. While runtime might take a bit longer, it's always better for scaling up to already have wheels prepared. Closes-Bug: #2004252 Change-Id: I5f53db8476eb394516fb35d593932d2552b95a57 --- defaults/main.yml | 4 +--- releasenotes/notes/wheel_build_enable-ea0bd0cb676128dd.yaml | 5 +++++ vars/main.yml | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/wheel_build_enable-ea0bd0cb676128dd.yaml diff --git a/defaults/main.yml b/defaults/main.yml index a91356b..b32a329 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -122,9 +122,7 @@ venv_wheels_rebuild: no # If the package concerned is built from a tarball, rather # than from a git source or pypi, then this may be best to # set to false. -# Default: Enabled when more then 1 host with same arch/distro -# is in play -venv_wheel_build_enable: "{{ _venv_wheel_build_enable }}" +venv_wheel_build_enable: True # Set the host where the wheels will be built. # If this host is not the same as the target host, then diff --git a/releasenotes/notes/wheel_build_enable-ea0bd0cb676128dd.yaml b/releasenotes/notes/wheel_build_enable-ea0bd0cb676128dd.yaml new file mode 100644 index 0000000..4ab564e --- /dev/null +++ b/releasenotes/notes/wheel_build_enable-ea0bd0cb676128dd.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + Default value of ``venv_wheel_build_enable`` has been changed to True. + Previously it was depending on amount of hosts targeted for the play. diff --git a/vars/main.yml b/vars/main.yml index e1dcdab..1742ba0 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -77,8 +77,6 @@ _venv_wheels_first_play_hosts: | {% endfor %} {{ first_hosts }} -_venv_wheel_build_enable: "{{ (_venv_wheels_play_hosts[ansible_facts['distribution_version'] ~ '_' ~ ansible_facts['architecture']] | length > 1) | bool }}" - _venv_pip_packages: "{{ (venv_default_pip_packages | union(venv_pip_packages)) | sort | select | list }}" _venv_build_dist_arch: "{{ (ansible_facts['distribution'] | lower) | replace(' ', '_') }}-{{ ansible_facts['distribution_version'].split('.')[:2] | join('.') }}-{{ ansible_facts['architecture'] | lower }}"