Merge "Use extras for ldap dependencies"

setup.cfg

@@ -21,6 +21,11 @@ classifier =
 packages =
     keystone
 
+[extras]
+ldap =
+  python-ldap>=2.4:python_version=='2.7'
+  ldappool>=1.0 # MPL
+
 [global]
 setup-hooks =
     pbr.hooks.setup_hook

test-requirements.txt

@@ -11,11 +11,6 @@ python-memcached>=1.56
 # Optional dogpile backend: MongoDB
 pymongo>=3.0.2
 
-# Optional backend: LDAP
-# authenticate against an existing LDAP server
-python-ldap>=2.4;python_version=='2.7'
-ldappool>=1.0 # MPL
-
 # Testing
 # computes code coverage percentages
 coverage>=3.6

tox.ini

@@ -9,6 +9,7 @@ install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       .[ldap]
 commands = bash tools/pretty_tox.sh '{posargs}'
 whitelist_externals = bash
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY