<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12456] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12456">12456</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 15:54:28 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>prefix py deps with py_</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementspy_basetxt">CalendarServer/trunk/requirements/py_base.txt</a></li>
<li><a href="#CalendarServertrunkrequirementspy_developtxt">CalendarServer/trunk/requirements/py_develop.txt</a></li>
<li><a href="#CalendarServertrunkrequirementspy_opt_LDAPtxt">CalendarServer/trunk/requirements/py_opt_LDAP.txt</a></li>
<li><a href="#CalendarServertrunkrequirementspy_opt_Oracletxt">CalendarServer/trunk/requirements/py_opt_Oracle.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsbasetxt">CalendarServer/trunk/requirements/base.txt</a></li>
<li><a href="#CalendarServertrunkrequirementsdeveloptxt">CalendarServer/trunk/requirements/develop.txt</a></li>
<li><a href="#CalendarServertrunkrequirementsopt_LDAPtxt">CalendarServer/trunk/requirements/opt_LDAP.txt</a></li>
<li><a href="#CalendarServertrunkrequirementsopt_Oracletxt">CalendarServer/trunk/requirements/opt_Oracle.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (12455 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/bin/_build.sh 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -107,9 +107,6 @@
</span><span class="cx">
</span><span class="cx"> python="${py_bindir}/python";
</span><span class="cx">
</span><del>- export PATH="${py_root}/bin:${PATH}";
- export PYTHONPATH="${py_libdir}:${PYTHONPATH:-}"
-
</del><span class="cx"> # These variables are defaults for things which might be configured by
</span><span class="cx"> # environment; only set them if they're un-set.
</span><span class="cx">
</span><span class="lines">@@ -550,8 +547,10 @@
</span><span class="cx"> # Build Python dependencies
</span><span class="cx"> #
</span><span class="cx"> py_dependencies () {
</span><del>- for requirements in "${wd}/requirements/"*; do
</del><ins>+ export PATH="${py_root}/bin:${PATH}";
</ins><span class="cx">
</span><ins>+ for requirements in "${wd}/requirements/py_"*".txt"; do
+
</ins><span class="cx"> ruler "Preparing Python requirements: ${requirements}";
</span><span class="cx"> echo "";
</span><span class="cx">
</span><span class="lines">@@ -562,7 +561,7 @@
</span><span class="cx"> ; then
</span><span class="cx"> err=$?;
</span><span class="cx"> echo "Unable to set up Python requirements: ${requirements}";
</span><del>- if [ "${requirements#${wd}/requirements/opt_}" != "${requirements}" ]; then
</del><ins>+ if [ "${requirements#${wd}/requirements/py_opt_}" != "${requirements}" ]; then
</ins><span class="cx"> echo "Requirements ${requirements} are optional; continuing.";
</span><span class="cx"> else
</span><span class="cx"> echo "";
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsbasetxt"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/requirements/base.txt (12455 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/base.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/base.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>-zope.interface==4.0.5
-twisted==13.2.0
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [DAL]
-
-# Twisted <3's SSL
-pyOpenSSL==0.12
-pycrypto==2.6.1
-pyasn1==0.1.7
-
--e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk#egg=kerberos
-
-# Data store
-xattr==0.6.4
-PyGreSQL==4.1.1
-sqlparse==0.1.2
-
-# Calendar
-python-dateutil==1.5
-pytz==2013.8
--e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk#egg=pycalendar
-
-# Process info
-psutil==1.2.0
-setproctitle==1.1.8
-
-# pycparser==2.10
</del></span></pre></div>
<a id="CalendarServertrunkrequirementsdeveloptxt"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/requirements/develop.txt (12455 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/develop.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/develop.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-docutils>=0.11
</del></span></pre></div>
<a id="CalendarServertrunkrequirementsopt_LDAPtxt"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/requirements/opt_LDAP.txt (12455 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/opt_LDAP.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/opt_LDAP.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [LDAP]
-python-ldap>=2.4.13
</del></span></pre></div>
<a id="CalendarServertrunkrequirementsopt_Oracletxt"></a>
<div class="delfile"><h4>Deleted: CalendarServer/trunk/requirements/opt_Oracle.txt (12455 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/opt_Oracle.txt 2014-01-27 20:16:06 UTC (rev 12455)
+++ CalendarServer/trunk/requirements/opt_Oracle.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -1,2 +0,0 @@
</span><del>-# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [Oracle]
-cx_Oracle==5.1.2
</del></span></pre></div>
<a id="CalendarServertrunkrequirementspy_basetxtfromrev12455CalendarServertrunkrequirementsbasetxt"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/requirements/py_base.txt (from rev 12455, CalendarServer/trunk/requirements/base.txt) (0 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/py_base.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_base.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+zope.interface==4.0.5
+twisted==13.2.0
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [DAL]
+
+# Twisted <3's SSL
+pyOpenSSL==0.12
+pycrypto==2.6.1
+pyasn1==0.1.7
+
+-e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk#egg=kerberos
+
+# Data store
+xattr==0.6.4
+PyGreSQL==4.1.1
+sqlparse==0.1.2
+
+# Calendar
+python-dateutil==1.5
+pytz==2013.8
+-e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk#egg=pycalendar
+
+# Process info
+psutil==1.2.0
+setproctitle==1.1.8
+
+# pycparser==2.10
</ins></span></pre></div>
<a id="CalendarServertrunkrequirementspy_developtxtfromrev12455CalendarServertrunkrequirementsdeveloptxt"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/requirements/py_develop.txt (from rev 12455, CalendarServer/trunk/requirements/develop.txt) (0 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/py_develop.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_develop.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+docutils>=0.11
</ins></span></pre></div>
<a id="CalendarServertrunkrequirementspy_opt_LDAPtxtfromrev12455CalendarServertrunkrequirementsopt_LDAPtxt"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/requirements/py_opt_LDAP.txt (from rev 12455, CalendarServer/trunk/requirements/opt_LDAP.txt) (0 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/py_opt_LDAP.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_opt_LDAP.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [LDAP]
+python-ldap>=2.4.13
</ins></span></pre></div>
<a id="CalendarServertrunkrequirementspy_opt_Oracletxtfromrev12455CalendarServertrunkrequirementsopt_Oracletxt"></a>
<div class="copfile"><h4>Copied: CalendarServer/trunk/requirements/py_opt_Oracle.txt (from rev 12455, CalendarServer/trunk/requirements/opt_Oracle.txt) (0 => 12456)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements/py_opt_Oracle.txt (rev 0)
+++ CalendarServer/trunk/requirements/py_opt_Oracle.txt 2014-01-27 23:54:28 UTC (rev 12456)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+# -e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk#egg=twextpy [Oracle]
+cx_Oracle==5.1.2
</ins></span></pre>
</div>
</div>
</body>
</html>