openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Override pyScss version for python3.10

Browse Source 
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
This commit is contained in:
Jonathan Rosser 2022-05-03 09:11:02 +01:00
parent c22a552c6f
commit 39c6022bf6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -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_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 ## The git source/branch for Horizon
horizon_git_repo: https://opendev.org/openstack/horizon horizon_git_repo: https://opendev.org/openstack/horizon
horizon_git_track_branch: master horizon_git_track_branch: master

2
tasks/horizon_install_source.yml
View File

@ -51,7 +51,7 @@
name: "python_venv_build" name: "python_venv_build"
vars: vars:
venv_python_executable: "{{ horizon_venv_python_executable }}" 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_build_distro_package_list: "{{ horizon_devel_distro_packages }}"
venv_install_destination_path: "{{ horizon_bin | dirname }}" venv_install_destination_path: "{{ horizon_bin | dirname }}"
venv_pip_install_args: "{{ horizon_pip_install_args }}" venv_pip_install_args: "{{ horizon_pip_install_args }}"