Skip to content

Commit 3842651

Browse files
authored
Merge pull request #63 from stackhpc/upstream/2024.1-2025-03-31
Synchronise 2024.1 with upstream
2 parents 0151e80 + cb4a1d3 commit 3842651

File tree

1 file changed

+1
-3
lines changed
  • playbooks/roles/bifrost-pip-install/tasks

1 file changed

+1
-3
lines changed

playbooks/roles/bifrost-pip-install/tasks/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@
4545
retries: "{{ pip_install_retries }}"
4646
delay: "{{ pip_install_delay }}"
4747
when: not source_install | bool
48-
environment:
49-
# NOTE(dtantsur): https://github.com/pypa/setuptools/issues/2353
50-
SETUPTOOLS_USE_DISTUTILS: stdlib
48+
environment: "{{ (bifrost_venv_env | combine({'SETUPTOOLS_USE_DISTUTILS': 'stdlib'})) if ansible_facts.python_version is version('3.12', '<') else bifrost_venv_env }}"
5149

5250
- name: "Install requirements from {{ sourcedir }} using pip"
5351
pip:

0 commit comments

Comments
 (0)