diff --git a/changelogs/fragments/394-setup.py-collision.yml b/changelogs/fragments/394-setup.py-collision.yml new file mode 100644 index 00000000..37991598 --- /dev/null +++ b/changelogs/fragments/394-setup.py-collision.yml @@ -0,0 +1,2 @@ +major_changes: + - Remove Ansible 2.9 / ansible-base 2.10 checks from ``setup.py`` for Ansible 6 so that we can finally ship wheels. This change is only active for Ansible 6 (https://github.com/ansible-community/antsibull/pull/394). diff --git a/src/antsibull/data/ansible-setup_py.j2 b/src/antsibull/data/ansible-setup_py.j2 index b2695588..9155734e 100644 --- a/src/antsibull/data/ansible-setup_py.j2 +++ b/src/antsibull/data/ansible-setup_py.j2 @@ -4,6 +4,7 @@ import os import sys from setuptools import setup +{% if version.major < 6 %} def detect_bad_upgrade(): # prevent direct upgrade from 2.9.x or earlier to 2.10 due to pip limitations @@ -144,6 +145,7 @@ if not os.environ.get('ANSIBLE_SKIP_CONFLICT_CHECK'): if detect_bad_upgrade(): sys.exit(1) +{% endif %} __version__ = '{{ version }}' __author__ = 'Ansible, Inc.'