diff options
| author | Matt Martz <matt@sivel.net> | 2019-08-12 15:13:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 15:13:07 -0500 |
| commit | 697b566971ef855d83292a7c8f954275100d6803 (patch) | |
| tree | ecb2bb7c5842e451899d5b186159e9f0b399bb1f /test/lib/ansible_test | |
| parent | 8bca160363390be79481a6f4b7673cbb5efb9278 (diff) | |
| download | ansible-697b566971ef855d83292a7c8f954275100d6803.tar.gz | |
Update units to pass on macOS (#60435)
* Update units to pass on macOS. Fixes #27810
* raising=False
Diffstat (limited to 'test/lib/ansible_test')
| -rw-r--r-- | test/lib/ansible_test/_data/requirements/constraints.txt | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/requirements/units.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/ansible_test/_data/requirements/constraints.txt b/test/lib/ansible_test/_data/requirements/constraints.txt index 4e55c47715..d619be6367 100644 --- a/test/lib/ansible_test/_data/requirements/constraints.txt +++ b/test/lib/ansible_test/_data/requirements/constraints.txt @@ -11,7 +11,7 @@ wheel < 0.30.0 ; python_version < '2.7' # wheel 0.30.0 and later require python yamllint != 1.8.0, < 1.14.0 ; python_version < '2.7' # yamllint 1.8.0 and 1.14.0+ require python 2.7+ pycrypto >= 2.6 # Need features found in 2.6 and greater ncclient >= 0.5.2 # Need features added in 0.5.2 and greater -idna < 2.6 # requests requires idna < 2.6, but cryptography will cause the latest version to be installed instead +idna < 2.6, >= 2.5 # linode requires idna < 2.9, >= 2.5, requests requires idna < 2.6, but cryptography will cause the latest version to be installed instead paramiko < 2.4.0 ; python_version < '2.7' # paramiko 2.4.0 drops support for python 2.6 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 diff --git a/test/lib/ansible_test/_data/requirements/units.txt b/test/lib/ansible_test/_data/requirements/units.txt index b198cbebcf..32c311c72d 100644 --- a/test/lib/ansible_test/_data/requirements/units.txt +++ b/test/lib/ansible_test/_data/requirements/units.txt @@ -10,6 +10,7 @@ pytest pytest-mock pytest-xdist python-memcached +pytz pyvmomi pyyaml redis |