From 39c6022bf62de7be116613137fdf7a05ed07c298 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 3 May 2022 09:11:02 +0100 Subject: [PATCH] Override pyScss version for python3.10 Openstack upper-constraints for the Yoga release does not specify a version of pyScss which is compatible with python3.10, this only starts to happen with the Zed release. To obtain experimental support for Ubuntu Jammy with the Yoga release we adjust the upper-constraints to describe a python3.10 compatible version of pyScss. Change-Id: I04b7b8bc2c8e666f155cccf58bd920ee7d699d72 --- defaults/main.yml | 5 +++++ tasks/horizon_install_source.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2d874381..0a6c5f99 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -32,6 +32,11 @@ horizon_venv_python_executable: "{{ openstack_venv_python_executable | default(' horizon_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" +horizon_venv_extra_constraints: + - "pyScss===1.3.7;python_version=='3.8'" + - "pyScss===1.3.7;python_version=='3.9'" + - "pyScss===1.4.0;python_version=='3.10'" + ## The git source/branch for Horizon horizon_git_repo: https://opendev.org/openstack/horizon horizon_git_track_branch: master diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index d0a2e67f..eb144bc1 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -51,7 +51,7 @@ name: "python_venv_build" vars: venv_python_executable: "{{ horizon_venv_python_executable }}" - venv_build_constraints: "{{ _u_c_contents.content.split('\n') | reject('match', '^horizon=') | list }}" + venv_build_constraints: "{{ _u_c_contents.content.split('\n') | reject('match', '^(horizon|pyScss)=') | list + horizon_venv_extra_constraints }}" venv_build_distro_package_list: "{{ horizon_devel_distro_packages }}" venv_install_destination_path: "{{ horizon_bin | dirname }}" venv_pip_install_args: "{{ horizon_pip_install_args }}"