summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/fragments/ansible-test-markupsafe-constraint-update.yml3
-rw-r--r--test/lib/ansible_test/_data/requirements/constraints.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/fragments/ansible-test-markupsafe-constraint-update.yml b/changelogs/fragments/ansible-test-markupsafe-constraint-update.yml
new file mode 100644
index 0000000000..b6cc3f1c92
--- /dev/null
+++ b/changelogs/fragments/ansible-test-markupsafe-constraint-update.yml
@@ -0,0 +1,3 @@
+bugfixes:
+ - ansible-test - Add constraint for ``MarkupSafe < 2.1.0`` on Python 3.6 and later.
+ This avoids installation failures when old ``pip`` or ``setuptools`` packages are present.
diff --git a/test/lib/ansible_test/_data/requirements/constraints.txt b/test/lib/ansible_test/_data/requirements/constraints.txt
index 1da30911f5..23afa24e88 100644
--- a/test/lib/ansible_test/_data/requirements/constraints.txt
+++ b/test/lib/ansible_test/_data/requirements/constraints.txt
@@ -46,6 +46,7 @@ botocore >= 1.10.0 ; python_version >= '2.7' # adds support for the following AW
setuptools < 37 ; python_version == '2.6' # setuptools 37 and later require python 2.7 or later
setuptools < 45 ; python_version == '2.7' # setuptools 45 and later require python 3.5 or later
MarkupSafe < 2.0.0 ; python_version < '3.6' # MarkupSafe >= 2.0.0. requires Python >= 3.6
+MarkupSafe < 2.1.0 ; python_version >= '3.6' # MarkupSafe 2.1.0 and later require setuptools 39.2+ or installation from a wheel, which not all environments support
# freeze pylint and its requirements for consistent test results
astroid == 2.3.3