<!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>[15745] 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/15745">15745</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-06 18:36:45 -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="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
<li><a href="#CalendarServertrunklibpatchesTwistedsecuretransportpatch">CalendarServer/trunk/lib-patches/Twisted/securetransport.patch</a></li>
<li><a href="#CalendarServertrunkrequirementscstxt">CalendarServer/trunk/requirements-cs.txt</a></li>
<li><a href="#CalendarServertrunkrequirementstwisteddefaulttxt">CalendarServer/trunk/requirements-twisted-default.txt</a></li>
<li><a href="#CalendarServertrunkrequirementstwistedosxtxt">CalendarServer/trunk/requirements-twisted-osx.txt</a></li>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
<li><a href="#CalendarServertrunktxdavbasedatastoredbapiclientpy">CalendarServer/trunk/txdav/base/datastore/dbapiclient.py</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 (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/bin/_build.sh 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> c_dependency -m "3f0c388566c688c82b01a0edf1e6b7a0" \
</span><span class="cx"> "PostgreSQL" "${p}" \
</span><span class="cx"> "http://ftp.postgresql.org/pub/source/v${v}/${p}.tar.bz2" \
</span><del>- --with-python ${enable_dtrace};
</del><ins>+ ${enable_dtrace};
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -678,6 +678,12 @@
</span><span class="cx"> --no-setuptools \
</span><span class="cx"> ${virtualenv_opts} \
</span><span class="cx"> "${py_virtualenv}";
</span><ins>+ case "$(uname -s)" in
+ Darwin)
+ echo "macOS virtualenv codesign fix."
+ cp "/usr/bin/python" "${py_bindir}/python";
+ ;;
+ esac;
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> cd "${wd}";
</span><span class="lines">@@ -735,37 +741,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-18.5 \
- pip-8.1.2 \
- virtualenv-15.0.2 \
</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="CalendarServertrunklibpatchesTwistedsecuretransportpatch"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/lib-patches/Twisted/securetransport.patch (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/lib-patches/Twisted/securetransport.patch 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/lib-patches/Twisted/securetransport.patch 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- twisted/internet/_sslverify.py (revision 45115)
</span><span class="cx"> +++ twisted/internet/_sslverify.py (working copy)
</span><del>-@@ -162,7 +162,9 @@
</del><ins>+@@ -174,7 +174,9 @@
+ "rejected."
+ )
</ins><span class="cx">
</span><del>- major, minor = list(int(part) for part in lib.__version__.split("."))[:2]
-
-- if (major, minor) >= (0, 12):
</del><ins>+- if _usablePyOpenSSL(lib.__version__):
</ins><span class="cx"> + if hasattr(lib, "__SecureTransport__"):
</span><span class="cx"> + pass
</span><del>-+ elif (major, minor) >= (0, 12):
</del><ins>++ elif _usablePyOpenSSL(lib.__version__):
</ins><span class="cx"> try:
</span><span class="cx"> from service_identity import VerificationError
</span><span class="cx"> from service_identity.pyopenssl import verify_hostname
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- twisted/protocols/tls.py (revision 45115)
</span><span class="cx"> +++ twisted/protocols/tls.py (working copy)
</span><del>-@@ -660,7 +660,9 @@
</del><ins>+@@ -705,7 +705,9 @@
</ins><span class="cx"> @rtype: L{OpenSSL.SSL.Connection}
</span><span class="cx"> """
</span><span class="cx"> context = self._oldStyleContextFactory.getContext()
</span></span></pre></div>
<a id="CalendarServertrunkrequirementscstxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-cs.txt (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-cs.txt 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/requirements-cs.txt 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -7,23 +7,23 @@
</span><span class="cx"> zope.interface==4.1.3
</span><span class="cx"> setuptools==18.5
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15734#egg=twextpy
- cffi==1.3.0
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15744#egg=twextpy
+ cffi==1.7.0
</ins><span class="cx"> pycparser==2.14
</span><span class="cx"> #twisted
</span><span class="cx">
</span><span class="cx"> # [LDAP] extra
</span><del>- python-ldap==2.4.22
</del><ins>+ python-ldap==2.4.25
</ins><span class="cx"> #setuptools
</span><span class="cx">
</span><span class="cx"> # [DAL] extra
</span><del>- sqlparse==0.1.18
</del><ins>+ sqlparse==0.1.19
</ins><span class="cx">
</span><span class="cx"> # [OpenDirectory] extra
</span><span class="cx"> #pyobjc-framework-OpenDirectory # Use system module
</span><span class="cx">
</span><span class="cx"> # [Postgres] extra
</span><del>- pg8000==1.10.2
</del><ins>+ pg8000==1.10.6
</ins><span class="cx">
</span><span class="cx"> # [Oracle] extra
</span><span class="cx"> #cx_Oracle==5.2 # Needs manual patch
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@15423#egg=kerberos
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@15423#egg=pycalendar
</span><del>- python-dateutil==2.4.2
- pytz==2015.7
</del><ins>+ python-dateutil==2.5.3
+ pytz==2016.4
</ins><span class="cx">
</span><del>- psutil==3.4.2
- setproctitle==1.1.9
</del><ins>+ psutil==4.3.0
+ setproctitle==1.1.10
</ins><span class="cx"> # xattr==0.7.5 # Only needed for upgrades from ancient versions. Added in _cache_deps.
</span><span class="cx"> #cffi
</span></span></pre></div>
<a id="CalendarServertrunkrequirementstwisteddefaulttxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-twisted-default.txt (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-twisted-default.txt 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/requirements-twisted-default.txt 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -3,27 +3,27 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx">
</span><del>-Twisted==15.4.0
</del><ins>+Twisted==16.3.0
</ins><span class="cx"> #zope.interface
</span><span class="cx">
</span><span class="cx"> # NOTE: Twisted also uses pyOpenSSL, pycrypto and service_identity,
</span><span class="cx"> # but doesn't specify them as dependencies, so that are explicitly
</span><span class="cx"> # added to calendarserver.
</span><span class="cx"> #pyOpenSSL
</span><del>- service_identity==14.0.0
</del><ins>+ service_identity==16.0.0
</ins><span class="cx"> characteristic==14.3.0
</span><span class="cx"> pyasn1==0.1.9
</span><span class="cx"> pyasn1-modules==0.0.8
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- pyOpenSSL==0.15.1
</del><ins>+ pyOpenSSL==16.0.0
</ins><span class="cx"> cryptography==1.1
</span><span class="cx"> idna
</span><span class="cx"> #pyasn1
</span><span class="cx"> #cffi
</span><del>- enum34==1.0.4
</del><ins>+ enum34==1.1.6
</ins><span class="cx"> ipaddress
</span><del>- #setuptools==17.0
</del><ins>+ #setuptools
</ins><span class="cx"> #six
</span><span class="cx"> six==1.10.0
</span></span></pre></div>
<a id="CalendarServertrunkrequirementstwistedosxtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-twisted-osx.txt (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-twisted-osx.txt 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/requirements-twisted-osx.txt 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -2,13 +2,13 @@
</span><span class="cx"> # Twisted dependency for OS X systems (uses pySecureTransport).
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-Twisted==15.4.0
</del><ins>+Twisted==16.3.0
</ins><span class="cx"> #zope.interface
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15423#egg=osxframeworks
</span><del>- #cffi==1.3.0
- # pycparser==2.14
</del><ins>+ #cffi
+ # pycparser
</ins><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PySecureTransport/trunk@15554#egg=pysecuretransport
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/setup.py 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> install_requirements = [
</span><span class="cx"> # Core frameworks
</span><span class="cx"> "zope.interface",
</span><del>- "Twisted==15.4.0",
</del><ins>+ "Twisted==16.3.0",
</ins><span class="cx"> "twextpy",
</span><span class="cx">
</span><span class="cx"> # Security frameworks
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasedatastoredbapiclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/dbapiclient.py (15744 => 15745)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/dbapiclient.py 2016-07-07 01:33:01 UTC (rev 15744)
+++ CalendarServer/trunk/txdav/base/datastore/dbapiclient.py 2016-07-07 01:36:45 UTC (rev 15745)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError
</span><span class="cx">
</span><span class="cx"> import pg8000 as postgres
</span><ins>+import six
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> import os
</span><span class="lines">@@ -430,7 +431,7 @@
</span><span class="cx"> return v.encode("utf-8") if isinstance(v, unicode) else str(v)
</span><span class="cx">
</span><span class="cx"> connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
</span><del>- connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
</del><ins>+ connection.realConnection.py_types[six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
</ins><span class="cx">
</span><span class="cx"> def my_text_recv(data, offset, length):
</span><span class="cx"> return str(data[offset: offset + length])
</span></span></pre>
</div>
</div>
</body>
</html>