travis: remove LDAP from test installation

With #701 we no longer require that the python ldap module is available
for nipapd to start so we can now run the tests (which don't enable the
ldap auth backend) without installing that module.

.travis.yml

@@ -55,8 +55,7 @@ install:
     # install nipap dependencies
     - if [ "$INSTALL" == "venv" ]; then pip install -r nipap/requirements.txt; fi
     # install postgresql module (can't get from pip).
-    # TODO: so weird; ldap doesn't work through pip...
-    - if [ "$INSTALL" == "venv" ]; then sudo apt-get install -qq -y python-ldap postgresql-9.1-ip4r; fi
+    - if [ "$INSTALL" == "venv" ]; then sudo apt-get install -qq -y postgresql-9.1-ip4r; fi
     # SQL
     - if [ "$INSTALL" == "venv" ]; then sudo su -c "cd nipap/sql; make install" postgres; fi
     # move configuration file into place
@@ -75,7 +74,7 @@ install:
     - if [ "$INSTALL" == "apt" ]; then wget -O - https://spritelink.github.io/NIPAP/nipap.gpg.key | sudo apt-key add -; fi
     - if [ "$INSTALL" == "apt" ]; then sudo apt-get update -qq; fi
     # install dependencies for installing & running nipap
-    - if [ "$INSTALL" == "apt" ]; then sudo apt-get install -qq -y --force-yes python-pysqlite2 python-psycopg2 python-ipy python-ldap python-docutils postgresql-9.1 postgresql-9.1-ip4r python-tornado python-flask python-flask-xml-rpc python-flask-compress python-parsedatetime python-tz python-dateutil python-psutil; fi
+    - if [ "$INSTALL" == "apt" ]; then sudo apt-get install -qq -y --force-yes python-pysqlite2 python-psycopg2 python-ipy python-docutils postgresql-9.1 postgresql-9.1-ip4r python-tornado python-flask python-flask-xml-rpc python-flask-compress python-parsedatetime python-tz python-dateutil python-psutil; fi
     # if we are testing the upgrade, first install NIPAP packages from official repo
     - if [ "$INSTALL" == "apt" ] && [ "$UPGRADE" == "true" ]; then sudo apt-get install -qq nipapd nipap-www nipap-cli; fi
     # bump version so that we know we are upgrading beyond what is installed

nipap/debian/control

@@ -8,7 +8,8 @@ Standards-Version: 3.9.1
 
 Package: nipap-common
 Architecture: all
-Depends: python (>= 2.7), ${misc:Depends}, python-pysqlite2, python-ldap, python-ipy
+Depends: python (>= 2.7), ${misc:Depends}, python-pysqlite2, python-ipy
+Suggests: python-ldap
 Description: Neat IP Address Planner
  The Neat IP Address Planner, NIPAP, is a system built for efficiently managing
  large amounts of IP addresses. This is the common libraries.

nipap/requirements.txt

@@ -12,7 +12,8 @@ parsedatetime==1.4
 psutil==1.2.1							# rq.filter: >= 1.0,<2.0
 psycopg2==2.6
 python-dateutil==2.4.2
-python-ldap==2.4.19
+# optional dependency on ldap
+#python-ldap==2.4.19
 pytz==2015.2
 tornado==4.1
 wsgiref==0.1.2