This commit is contained in:
parent
c04a751f0e
commit
90a8d07f31
2 changed files with 11 additions and 0 deletions
3
changelogs/fragments/71279-skip-conflict-check.yml
Normal file
3
changelogs/fragments/71279-skip-conflict-check.yml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
minor_changes:
|
||||||
|
- setup.py - Skip doing conflict checks for ``sdist`` and ``egg_info`` commands
|
||||||
|
(https://github.com/ansible/ansible/pull/71310)
|
8
setup.py
8
setup.py
|
@ -54,6 +54,14 @@ def _validate_install_ansible_base():
|
||||||
"""Validate that we can install ansible-base. Currently this only
|
"""Validate that we can install ansible-base. Currently this only
|
||||||
cares about upgrading to ansible-base from ansible<2.10
|
cares about upgrading to ansible-base from ansible<2.10
|
||||||
"""
|
"""
|
||||||
|
# Skip common commands we can ignore
|
||||||
|
# Do NOT add bdist_wheel here, we don't ship wheels
|
||||||
|
# and bdist_wheel is the only place we can prevent pip
|
||||||
|
# from installing, as pip creates a wheel, and installs the wheel
|
||||||
|
# and we have no influence over installation within a wheel
|
||||||
|
if set(('sdist', 'egg_info')).intersection(sys.argv):
|
||||||
|
return
|
||||||
|
|
||||||
if os.getenv('ANSIBLE_SKIP_CONFLICT_CHECK', '') not in ('', '0'):
|
if os.getenv('ANSIBLE_SKIP_CONFLICT_CHECK', '') not in ('', '0'):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue