summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2022-02-21 17:21:39 -0800
committerMatt Clay <matt@mystile.com>2022-02-21 23:48:01 -0800
commitaafa65999c1b0bc519e3aa656361630d8d04579f (patch)
treedf7e2af89659d1803ac924f0f7cf0db7a5c5a68e
parentfdadc39af342a984ca8791b6a5d0ec3bd4ecb5d9 (diff)
downloadansible-aafa65999c1b0bc519e3aa656361630d8d04579f.tar.gz
ansible-test - Add MarkupSafe constraint.
Installation of MarkupSafe 2.1.0 and later require setuptools 39.2 or later, or a recent version of pip which supports installation using a wheel. Some systems will not have new enough versions of pip and/or setuptools, especially virtual environments -- including those created by ansible-test.
-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 1f06c06c5b..63137c3e7f 100644
--- a/test/lib/ansible_test/_data/requirements/constraints.txt
+++ b/test/lib/ansible_test/_data/requirements/constraints.txt
@@ -40,6 +40,7 @@ lxml < 4.3.0 ; python_version < '2.7' # lxml 4.3.0 and later require python 2.7
pyvmomi < 6.0.0 ; python_version < '2.7' # pyvmomi 6.0.0 and later require python 2.7 or later
pyone == 1.1.9 # newer versions do not pass current integration tests
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
botocore >= 1.10.0 # adds support for the following AWS services: secretsmanager, fms, and acm-pca
setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later
cffi != 1.14.4 # Fails on systems with older gcc. Should be fixed in the next release. https://foss.heptapod.net/pypy/cffi/-/issues/480