From d4ef66fc028477709d6e4bd36a2bb39c957c3eae Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 16 Oct 2023 20:00:17 +0200 Subject: [PATCH] Override pyScss version with a bugfixed one In order to compress static files against pyhton 3.11 a fixed version with fixed regexp in pyScss is needed. While fix is merged, pyScss is not tagged/released yet. While this required only for Debian12, it will work nicely also with older python versions, since there're almost no changes in the package. instead of building based on SHA. Change-Id: I76f945310b70c1b081800c5ba0ec922795b60a73 --- defaults/main.yml | 1 + tasks/horizon_install_source.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1a3007d7..3bb22b89 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -436,6 +436,7 @@ horizon_listen_ports: horizon_pip_packages: - "git+{{ horizon_git_repo }}@{{ horizon_git_install_branch }}#egg=horizon" + - "git+https://github.com/Kronuz/pyScss@60414f5d573315a8458b5fbcdf69e5c648c44a9a" # needed for python>=3.11 - pymemcache - python-memcached diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 32ffadce..81b4bd10 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -29,7 +29,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 + horizon_venv_extra_constraints }}" + 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 }}"