[CalendarServer-changes] [14289] CalendarServer/trunk/support/_cache_deps
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 12 14:26:16 PST 2015
Revision: 14289
http://trac.calendarserver.org//changeset/14289
Author: wsanchez at apple.com
Date: 2015-01-12 14:26:16 -0800 (Mon, 12 Jan 2015)
Log Message:
-----------
Filter out python-ldap
Modified Paths:
--------------
CalendarServer/trunk/support/_cache_deps
Modified: CalendarServer/trunk/support/_cache_deps
===================================================================
--- CalendarServer/trunk/support/_cache_deps 2015-01-12 21:49:47 UTC (rev 14288)
+++ CalendarServer/trunk/support/_cache_deps 2015-01-12 22:26:16 UTC (rev 14289)
@@ -19,6 +19,7 @@
set -e
set -u
+set -x
wd="$(cd "$(dirname "$0")/.." && pwd)";
@@ -58,22 +59,26 @@
# Download dependencies
#
-tmp="$(mktemp -d -t CalendarServer_ve_tools)";
+ve_tmp="$(mktemp -d -t CalendarServer_ve_tools)";
# Bootstrap virtualenv and friends so we can use them
-py_ve_tools="${tmp}/ve_tools";
+py_ve_tools="${ve_tmp}/ve_tools";
export PYTHONPATH="${py_ve_tools}/lib:${wd}:${PYTHONPATH:-}";
bootstrap_virtualenv;
+reqs_to_use="${ve_tmp}/requirements.txt";
+
+sed -e '/python-ldap/d' < "${requirements}" > "${reqs_to_use}";
+
ruler "Downloading Python requirements for .[${extra_features}]";
echo "";
pip_download \
--allow-unverified cx-Oracle \
--no-deps \
- --requirement="${requirements}" \
+ --requirement="${reqs_to_use}" \
;
-rm -rf "${tmp}";
+rm -rf "${ve_tmp}";
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150112/0d529ea9/attachment.html>
More information about the calendarserver-changes
mailing list