diff --git a/test-requirements.txt b/test-requirements.txt index d15c6f54..47902a53 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,17 +3,13 @@ # process, which may cause wedges in the gate later. bashate>=0.2 # Apache-2.0 flake8<2.6.0,>=2.5.4 # MIT +pyasn1 # BSD +pyOpenSSL>=0.14 # Apache-2.0 +requests>=2.10.0 # Apache-2.0 +ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD # this is required for the docs build jobs sphinx!=1.3b1,<1.3,>=1.2.1 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 doc8 # Apache-2.0 reno>=1.8.0 # Apache2 - -# NOTE(mhayden): CentOS 7 has Python 2.7.5, which has no SNI support built in. -# Two of the required Python modules for SNI support are here -# and the remaining one (ndg-httpsclient) is in the tox.ini -# since this module isn't found within the global requirements -# list. -pyasn1 # BSD -pyOpenSSL>=0.14 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 5e171124..7ac9e0ee 100644 --- a/tox.ini +++ b/tox.ini @@ -105,12 +105,6 @@ deps = {[testenv]deps} ansible==1.9.4 ansible-lint>=2.7.0,<3.0.0 - # NOTE(mhayden): CentOS 7 has Python 2.7.5, which has no SNI support built - # in. Two modules exist in global requirements, and they are - # in test-requirements.txt. This one isn't found in the - # global requirements list, so it needs to be manually added - # here. - ndg-httpsclient setenv = {[testenv]setenv} ANSIBLE_HOST_KEY_CHECKING = False