diff options
| author | Matt Clay <matt@mystile.com> | 2021-09-07 18:32:00 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2021-09-07 22:34:58 -0700 |
| commit | ef8f41c940e83fc1900a05cb883da149e786d89a (patch) | |
| tree | 0ffa1d013207f4128c7dc791eba867ef43243bb0 | |
| parent | 5faae7f464dc7c60ed3a416656ce0144ff94125b (diff) | |
| download | ansible-ef8f41c940e83fc1900a05cb883da149e786d89a.tar.gz | |
Revert "[stable-2.9] Add additional constraint for `setuptools` (#75651)"
This reverts commit 5faae7f464dc7c60ed3a416656ce0144ff94125b.
Now that `setuptools` version 58.0.3 has been released, this change is no longer needed.
| -rw-r--r-- | changelogs/fragments/setuptools-constraint.yml | 5 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/requirements/constraints.txt | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/changelogs/fragments/setuptools-constraint.yml b/changelogs/fragments/setuptools-constraint.yml deleted file mode 100644 index 948f24163e..0000000000 --- a/changelogs/fragments/setuptools-constraint.yml +++ /dev/null @@ -1,5 +0,0 @@ -bugfixes: - - >- - ansible_test - add additional constraint for ``setuptools`` on Python >= 3.5 due to a bug - in the recently released version of ``setuptools`` related to the 'use_2to3' feature - (https://github.com/ansible/ansible/pull/75651) diff --git a/test/lib/ansible_test/_data/requirements/constraints.txt b/test/lib/ansible_test/_data/requirements/constraints.txt index 8a9ed6d910..611a198129 100644 --- a/test/lib/ansible_test/_data/requirements/constraints.txt +++ b/test/lib/ansible_test/_data/requirements/constraints.txt @@ -42,7 +42,6 @@ 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 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 -setuptools < 58.0.2 ; python_version >= '3.5' # setuptools 58.0.2 breaks installation of packages, such as coverage, that reference the 'use_2to3' feature 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 websocket-client < 1 ; python_version < '3' # version 1.0.0 drops support for python 2 |