<!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>[15744] twext/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/15744">15744</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-06 18:33:01 -0700 (Wed, 06 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updating to latest python packages and simplifying venv bootstrap.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkbin_buildsh">twext/trunk/bin/_build.sh</a></li>
<li><a href="#twexttrunksetuppy">twext/trunk/setup.py</a></li>
<li><a href="#twexttrunktwextenterpriseadbapi2py">twext/trunk/twext/enterprise/adbapi2.py</a></li>
<li><a href="#twexttrunktwextpythonlogpy">twext/trunk/twext/python/log.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/_build.sh (15743 => 15744)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_build.sh 2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/bin/_build.sh 2016-07-07 01:33:01 UTC (rev 15744)
</span><span class="lines">@@ -594,37 +594,15 @@
</span><span class="cx">
</span><span class="cx"> bootstrap_virtualenv () {
</span><span class="cx"> mkdir -p "${py_ve_tools}";
</span><del>- mkdir -p "${py_ve_tools}/lib";
- mkdir -p "${py_ve_tools}/junk";
</del><ins>+ export PYTHONUSERBASE="${py_ve_tools}"
</ins><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- setuptools-17.0 \
- pip-7.0.3 \
- virtualenv-13.0.3 \
</del><ins>+ setuptools==18.5 \
+ pip==8.1.2 \
+ virtualenv==15.0.2 \
</ins><span class="cx"> ; do
</span><del>- local name="${pkg%-*}";
- local version="${pkg#*-}";
- local first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
- local url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
-
- ruler "Downloading ${pkg}";
-
- local tmp="$(mktemp -d -t ccsXXXXX)";
-
- curl -L "${url}" | tar -C "${tmp}" -xvzf -;
-
- cd "${tmp}/$(basename "${pkg}")";
- PYTHONPATH="${py_ve_tools}/lib" \
- "${bootstrap_python}" setup.py install \
- --install-base="${py_ve_tools}" \
- --install-lib="${py_ve_tools}/lib" \
- --install-headers="${py_ve_tools}/junk" \
- --install-scripts="${py_ve_tools}/junk" \
- --install-data="${py_ve_tools}/junk" \
- ; \
- cd "${wd}";
-
- rm -rf "${tmp}";
</del><ins>+ ruler "Installing ${pkg}";
+ "${bootstrap_python}" -m pip install -I --user "${pkg}";
</ins><span class="cx"> done;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunksetuppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/setup.py (15743 => 15744)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/setup.py 2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/setup.py 2016-07-07 01:33:01 UTC (rev 15744)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx">
</span><span class="cx"> install_requirements = [
</span><span class="cx"> "cffi",
</span><del>- "twisted>=15.4",
</del><ins>+ "twisted>=16.3",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> extras_requirements = {
</span></span></pre></div>
<a id="twexttrunktwextenterpriseadbapi2py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/enterprise/adbapi2.py (15743 => 15744)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/enterprise/adbapi2.py 2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/twext/enterprise/adbapi2.py 2016-07-07 01:33:01 UTC (rev 15744)
</span><span class="lines">@@ -1696,7 +1696,7 @@
</span><span class="cx">
</span><span class="cx"> @rtype: L{IAsyncTransaction}
</span><span class="cx"> """
</span><del>- txnid = str(self._nextID())
</del><ins>+ txnid = self._nextID()
</ins><span class="cx"> txn = _NetTransaction(client=self, transactionID=txnid)
</span><span class="cx"> self._txns[txnid] = txn
</span><span class="cx"> self.callRemote(StartTxn, transactionID=txnid)
</span></span></pre></div>
<a id="twexttrunktwextpythonlogpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/python/log.py (15743 => 15744)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/python/log.py 2016-07-06 17:45:03 UTC (rev 15743)
+++ twext/trunk/twext/python/log.py 2016-07-07 01:33:01 UTC (rev 15744)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> FileLogObserver, FilteringLogObserver, LogLevelFilterPredicate, \
</span><span class="cx"> formatEventAsClassicLogText, formatTime
</span><span class="cx"> from twisted.python import log
</span><ins>+from twisted import logger
</ins><span class="cx">
</span><span class="cx"> class Logger(_Logger):
</span><span class="cx"> """
</span><span class="lines">@@ -108,4 +109,4 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Logger.logBeginner = FilteringLogBeginnerWrapper(log.theLogPublisher._logBeginner)
</span><del>-log.theLogPublisher._logBeginner = Logger.logBeginner
</del><ins>+logger.globalLogBeginner = Logger.logBeginner
</ins></span></pre>
</div>
</div>
</body>
</html>