[CalendarServer-changes] [12304] twext/trunk

[source_changes at macosforge.org]

Revision: 12304
          http://trac.calendarserver.org//changeset/12304
Author:   wsanchez at apple.com
Date:     2014-01-11 10:46:54 -0800 (Sat, 11 Jan 2014)
Log Message:
-----------
Make python-ldap optional.

Modified Paths:
--------------
    twext/trunk/develop
    twext/trunk/setup.py

Modified: twext/trunk/develop
===================================================================
--- twext/trunk/develop	2014-01-11 18:40:27 UTC (rev 12303)
+++ twext/trunk/develop	2014-01-11 18:46:54 UTC (rev 12304)
@@ -21,6 +21,8 @@
 
 wd="$(cd "$(dirname "$0")" && pwd)";
 
+export TWEXT_DEVELOP="true";
+
 . "${wd}/bin/_build.sh";
 init_build;
 c_dependencies;

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2014-01-11 18:40:27 UTC (rev 12303)
+++ twext/trunk/setup.py	2014-01-11 18:46:54 UTC (rev 12304)
@@ -20,6 +20,7 @@
 
 import sys
 import errno
+import os
 from os.path import dirname, abspath, join as joinpath
 import subprocess
 
@@ -116,10 +117,15 @@
 install_requirements = [
     "twisted>=13.2.0",
     "sqlparse==0.1.2",
-    "python-ldap>=2.4.13",
 ]
 
+# FIXME: It would be better to just get `setup.py develop` to fetch the
+# extras_requirements...
+if os.environ.get("TWEXT_DEVELOP", "false") == "true":
+    install_requirements.append("python-ldap>=2.4.13")
+
 extras_requirements = {
+    "LDAP": ["python-ldap>=2.4.13"],
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/9781349a/attachment.html>