From 90a8d07f31691db55db77296d4e9b59bcf1e2d63 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Thu, 27 Aug 2020 12:44:30 -0500 Subject: [PATCH] [stable-2.10] Don't do conflict check on sdist and egg_info (#71310) (#71316) --- changelogs/fragments/71279-skip-conflict-check.yml | 3 +++ setup.py | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 changelogs/fragments/71279-skip-conflict-check.yml diff --git a/changelogs/fragments/71279-skip-conflict-check.yml b/changelogs/fragments/71279-skip-conflict-check.yml new file mode 100644 index 00000000000..77e2655938c --- /dev/null +++ b/changelogs/fragments/71279-skip-conflict-check.yml @@ -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) diff --git a/setup.py b/setup.py index 55dd2d357dc..b15d4c966d0 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,14 @@ def _validate_install_ansible_base(): """Validate that we can install ansible-base. Currently this only 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'): return