<!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>[12079] 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/12079">12079</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 19:00:35 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>twext is now external</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
<li><a href="#CalendarServertrunksupportbuildsh">CalendarServer/trunk/support/build.sh</a></li>
<li><a href="#CalendarServertrunktest">CalendarServer/trunk/test</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>CalendarServer/trunk/twext/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (12078 => 12079)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2013-12-13 02:28:15 UTC (rev 12078)
+++ CalendarServer/trunk/setup.py 2013-12-13 03:00:35 UTC (rev 12079)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> # See the License for the specific language governing permissions and
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><ins>+
</ins><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><span class="cx"> import sys
</span><span class="lines">@@ -26,18 +27,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def find_modules():
</del><ins>+def find_packages():
</ins><span class="cx"> modules = [
</span><span class="cx"> "twisted.plugins",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>- for root, dirs, files in os.walk("."):
- excludes = [
- ".svn",
- "_trial_temp",
- "build",
- ]
</del><ins>+ excludes = [
+ ".svn",
+ "_trial_temp",
+ "build",
+ ]
</ins><span class="cx">
</span><ins>+ for root, dirs, files in os.walk("."):
</ins><span class="cx"> if root == ".":
</span><span class="cx"> excludes.append("data")
</span><span class="cx">
</span><span class="lines">@@ -50,6 +51,7 @@
</span><span class="cx">
</span><span class="cx"> return modules
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="lines">@@ -61,6 +63,7 @@
</span><span class="cx">
</span><span class="cx"> classifiers = None
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Write version file
</span><span class="cx"> #
</span><span class="lines">@@ -75,16 +78,14 @@
</span><span class="cx"> version_file.write('version = "{version}"\n'.format(version=version_string))
</span><span class="cx"> version_file.close()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Set up Extension modules that need to be built
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> from distutils.core import Extension
</span><span class="cx">
</span><del>-extensions = [
- Extension("twext.python.sendmsg",
- sources=["twext/python/sendmsg.c"])
-]
</del><ins>+extensions = []
</ins><span class="cx">
</span><span class="cx"> if sys.platform == "darwin":
</span><span class="cx"> extensions.append(
</span><span class="lines">@@ -95,11 +96,7 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- from twext.python import launchd
- extensions.append(launchd.ffi.verifier.get_extension())
</del><span class="cx">
</span><del>-
-
</del><span class="cx"> #
</span><span class="cx"> # Run setup
</span><span class="cx"> #
</span><span class="lines">@@ -112,13 +109,13 @@
</span><span class="cx"> version=version_string,
</span><span class="cx"> description=description,
</span><span class="cx"> long_description=long_description,
</span><del>- url=None,
</del><ins>+ url="http://www.calendarserver.org/",
</ins><span class="cx"> classifiers=classifiers,
</span><span class="cx"> author="Apple Inc.",
</span><span class="cx"> author_email=None,
</span><del>- license=None,
</del><ins>+ license="Apache License, Version 2.0",
</ins><span class="cx"> platforms=["all"],
</span><del>- packages=find_modules(),
</del><ins>+ packages=find_packages(),
</ins><span class="cx"> package_data={
</span><span class="cx"> "twistedcaldav": [
</span><span class="cx"> "*.html",
</span><span class="lines">@@ -237,6 +234,5 @@
</span><span class="cx"> newScript.close()
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> doSetup()
</span></span></pre></div>
<a id="CalendarServertrunksupportbuildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/support/build.sh (12078 => 12079)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/support/build.sh 2013-12-13 02:28:15 UTC (rev 12078)
+++ CalendarServer/trunk/support/build.sh 2013-12-13 03:00:35 UTC (rev 12079)
</span><span class="lines">@@ -509,9 +509,7 @@
</span><span class="cx"> # already has it?
</span><span class="cx"> local inplace=""; # Do development in-place; don't run setup.py to
</span><span class="cx"> # build, and instead add the source directory plus the
</span><del>- # given relative path directly to sys.path. twisted
- # and pycalendar are developed often enough that this is
- # convenient.
</del><ins>+ # given relative path directly to sys.path.
</ins><span class="cx"> local skip_egg="false"; # Skip even the 'egg_info' step, because nothing needs
</span><span class="cx"> # to be built.
</span><span class="cx"> local revision="0"; # Revision (if svn)
</span><span class="lines">@@ -777,6 +775,20 @@
</span><span class="cx"> "setuptools" "setuptools" "${st}" \
</span><span class="cx"> "$pypi/s/setuptools/${st}.tar.gz";
</span><span class="cx">
</span><ins>+ local v="0.6";
+ local n="cffi";
+ local p="${n}-${v}";
+ py_dependency -v "0.6" -m "5be33b1ab0247a984d42b27344519337" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/c/${n}/${p}.tar.gz";
+
+ local v="2.10";
+ local n="pycparser";
+ local p="${n}-${v}";
+ py_dependency -v "0.6" -m "d87aed98c8a9f386aa56d365fe4d515f" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+
</ins><span class="cx"> local v="4.0.5";
</span><span class="cx"> local n="zope.interface";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="lines">@@ -793,8 +805,10 @@
</span><span class="cx">
</span><span class="cx"> local n="PyKerberos";
</span><span class="cx"> if type -P krb5-config > /dev/null; then
</span><del>- py_dependency -r 9409 \
- "${n}" "kerberos" "${n}" \
</del><ins>+ local v="9409";
+ local p="${n}-${v}";
+ py_dependency -r "${v}" \
+ "${n}" "kerberos" "${p}" \
</ins><span class="cx"> "${svn_uri_base}/${n}/trunk";
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="lines">@@ -821,6 +835,27 @@
</span><span class="cx"> "${n}" "pgdb" "${p}" \
</span><span class="cx"> "${pypi}/P/${n}/${p}.tgz";
</span><span class="cx">
</span><ins>+ local v="0.1.2";
+ local n="sqlparse";
+ local p="${n}-${v}";
+ py_dependency -v "${v}" -s "978874e5ebbd78e6d419e8182ce4fb3c30379642" \
+ "SQLParse" "${n}" "${p}" \
+ "http://python-sqlparse.googlecode.com/files/${p}.tar.gz";
+
+ local v="2.6.1";
+ local n="pycrypto";
+ local p="${n}-${v}";
+ py_dependency -v "${v}" -m "55a61a054aa66812daf5161a0d5d7eda" \
+ "PyCrypto" "${n}" "${p}" \
+ "http://ftp.dlitz.net/pub/dlitz/crypto/${n}/${p}.tar.gz";
+
+ local v="0.1.7";
+ local n="pyasn1";
+ local p="${n}-${v}";
+ py_dependency -v "${v}" -m "2cbd80fcd4c7b1c82180d3d76fee18c8" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+
</ins><span class="cx"> local v="13.2.0";
</span><span class="cx"> local n="Twisted";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="lines">@@ -828,6 +863,13 @@
</span><span class="cx"> "${n}" "twisted" "${p}" \
</span><span class="cx"> "${pypi}/T/${n}/${p}.tar.bz2";
</span><span class="cx">
</span><ins>+ local v="12078";
+ local n="twext";
+ local p="${n}-${v}";
+ py_dependency -fe -r "${v}" \
+ "${n}" "${n}" "${p}" \
+ "${svn_uri_base}/${n}/trunk";
+
</ins><span class="cx"> local v="1.5";
</span><span class="cx"> local n="python-dateutil";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="lines">@@ -849,23 +891,26 @@
</span><span class="cx"> "Python-LDAP" "ldap" "${p}" \
</span><span class="cx"> "${pypi}/p/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- # XXX actually PyCalendar should be imported in-place.
- py_dependency -fe -i "src" -r 11947 \
- "PyCalendar" "pycalendar" "pycalendar" \
- "${svn_uri_base}/PyCalendar/trunk";
</del><ins>+ local v="11947";
+ local n="PyCalendar";
+ local p="${n}-${v}";
+ py_dependency -fe -i "src" -r "${v}" \
+ "${n}" "pycalendar" "${p}" \
+ "${svn_uri_base}/${n}/trunk";
</ins><span class="cx">
</span><ins>+ # Can't add "-v 2011g" to args because the version check expects numbers.
+ local v="2013.8";
+ local n="pytz";
+ local p="${n}-${v}";
+ py_dependency -m "37750ca749ed3a52523b9682b0b7e381" \
+ "${n}" "${n}" "${p}" \
+ "${pypi}/p/${n}/${p}.tar.gz";
+
</ins><span class="cx"> #
</span><span class="cx"> # Tool dependencies. The code itself doesn't depend on these, but
</span><span class="cx"> # they are useful to developers.
</span><span class="cx"> #
</span><span class="cx">
</span><del>- local v="0.1.2";
- local n="sqlparse";
- local p="${n}-${v}";
- py_dependency -v "${v}" -s "978874e5ebbd78e6d419e8182ce4fb3c30379642" \
- "SQLParse" "${n}" "${p}" \
- "http://python-sqlparse.googlecode.com/files/${p}.tar.gz";
-
</del><span class="cx"> if type -P pyflakes > /dev/null; then
</span><span class="cx"> using_system "PyFlakes";
</span><span class="cx"> else
</span><span class="lines">@@ -877,32 +922,13 @@
</span><span class="cx"> "${pypi}/p/${n}/${p}.tar.gz";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- py_dependency -o -r HEAD \
- "CalDAVClientLibrary" "caldavclientlibrary" "CalDAVClientLibrary" \
- "${svn_uri_base}/CalDAVClientLibrary/trunk";
-
- # Can't add "-v 2011g" to args because the version check expects numbers.
- local v="2013.8";
- local n="pytz";
</del><ins>+ local v="12068";
+ local n="CalDAVClientLibrary";
</ins><span class="cx"> local p="${n}-${v}";
</span><del>- py_dependency -m "37750ca749ed3a52523b9682b0b7e381" \
- "${n}" "${n}" "${p}" \
- "${pypi}/p/${n}/${p}.tar.gz";
</del><ins>+ py_dependency -o -r "${v}" \
+ "${n}" "caldavclientlibrary" "${p}" \
+ "${svn_uri_base}/${n}/trunk";
</ins><span class="cx">
</span><del>- local v="2.6.1";
- local n="pycrypto";
- local p="${n}-${v}";
- py_dependency -v "${v}" -m "55a61a054aa66812daf5161a0d5d7eda" \
- "PyCrypto" "${n}" "${p}" \
- "http://ftp.dlitz.net/pub/dlitz/crypto/${n}/${p}.tar.gz";
-
- local v="0.1.7";
- local n="pyasn1";
- local p="${n}-${v}";
- py_dependency -v "${v}" -m "2cbd80fcd4c7b1c82180d3d76fee18c8" \
- "${n}" "${n}" "${p}" \
- "${pypi}/p/${n}/${p}.tar.gz";
-
</del><span class="cx"> local v="1.1.8";
</span><span class="cx"> local n="setproctitle";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="lines">@@ -910,20 +936,6 @@
</span><span class="cx"> "${n}" "${n}" "${p}" \
</span><span class="cx"> "${pypi}/s/${n}/${p}.tar.gz";
</span><span class="cx">
</span><del>- local v="0.6";
- local n="cffi";
- local p="${n}-${v}";
- py_dependency -v "0.6" -m "5be33b1ab0247a984d42b27344519337" \
- "${n}" "${n}" "${p}" \
- "${pypi}/c/${n}/${p}.tar.gz";
-
- local v="2.10";
- local n="pycparser";
- local p="${n}-${v}";
- py_dependency -v "0.6" -m "d87aed98c8a9f386aa56d365fe4d515f" \
- "${n}" "${n}" "${p}" \
- "${pypi}/p/${n}/${p}.tar.gz";
-
</del><span class="cx"> svn_get "CalDAVTester" "${top}/CalDAVTester" \
</span><span class="cx"> "${svn_uri_base}/CalDAVTester/trunk" HEAD;
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktest"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/test (12078 => 12079)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/test 2013-12-13 02:28:15 UTC (rev 12078)
+++ CalendarServer/trunk/test 2013-12-13 03:00:35 UTC (rev 12079)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> test_modules="$@";
</span><span class="cx"> flaky=true;
</span><span class="cx"> else
</span><del>- test_modules="calendarserver twistedcaldav twext txdav contrib ${m_twisted}";
</del><ins>+ test_modules="calendarserver twistedcaldav txdav contrib ${m_twisted}";
</ins><span class="cx"> flaky=true;
</span><span class="cx"> fi;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>