diff options
| author | Matt Clay <matt@mystile.com> | 2020-08-17 11:53:12 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-08-18 11:45:26 -0700 |
| commit | eddb0920e4a4c89ebf1502a53baa8f73cc7e6a41 (patch) | |
| tree | cb497437273340035ff676430fd11108470ae698 | |
| parent | c6eff6bdb25724db7de1317f1f007e3a43fde1e2 (diff) | |
| download | ansible-eddb0920e4a4c89ebf1502a53baa8f73cc7e6a41.tar.gz | |
Revert "[stable-2.8] Cap pytest version to avoid relative import issue."
This reverts commit 9c5663699f87072dc540a4bdde181b0f88a5f489.
| -rw-r--r-- | changelogs/fragments/ansible-test-pytest-cap.yml | 2 | ||||
| -rw-r--r-- | test/runner/requirements/constraints.txt | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/changelogs/fragments/ansible-test-pytest-cap.yml b/changelogs/fragments/ansible-test-pytest-cap.yml deleted file mode 100644 index 42457aa0e5..0000000000 --- a/changelogs/fragments/ansible-test-pytest-cap.yml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: - - ansible-test - Add ``pytest < 6.0.0`` constraint for managed installations on Python 3.x to avoid issues with relative imports. diff --git a/test/runner/requirements/constraints.txt b/test/runner/requirements/constraints.txt index b83be64e0e..153db06ed6 100644 --- a/test/runner/requirements/constraints.txt +++ b/test/runner/requirements/constraints.txt @@ -17,7 +17,6 @@ paramiko < 2.4.0 ; python_version < '2.7' # paramiko 2.4.0 drops support for pyt paramiko < 2.5.0 ; python_version >= '2.7' # paramiko 2.5.0 requires cryptography 2.5.0+ pytest < 3.3.0 ; python_version < '2.7' # pytest 3.3.0 drops support for python 2.6 pytest < 5.0.0 ; python_version == '2.7' # pytest 5.0.0 and later will no longer support python 2.7 -pytest < 6.0.0 ; python_version > '2.7' # pytest 6.0.0 and later have issues with relative imports (further investigation required) pytest-forked < 1.0.2 ; python_version < '2.7' # pytest-forked 1.0.2 and later require python 2.7 or later pytest-forked >= 1.0.2 ; python_version >= '2.7' # pytest-forked before 1.0.2 does not work with pytest 4.2.0+ (which requires python 2.7+) ntlm-auth >= 1.0.6 # message encryption support |