openstack/openstack-ansible-os_horizon
Code Issues Proposed changes

Merge "Override pyScss version for python3.10"

Browse Source
This commit is contained in:
Zuul 2022-05-04 15:15:09 +00:00 committed by Gerrit Code Review
commit aa9468459f
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

@ -29,7 +29,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 }}"