<!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>[12202] 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/12202">12202</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-23 15:44:54 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use "setup.py develop" to fetch dependancies.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkpython">twext/trunk/python</a></li>
<li><a href="#twexttrunksetuppy">twext/trunk/setup.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#twexttrunktest">twext/trunk/test</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#twexttrunk">twext/trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunk"></a>
<div class="propset"><h4>Property changes: twext/trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">.pydevproject
</span><span class="cx">_trial_temp
</span><span class="cx">twextpy.egg-info
</span><span class="cx"> + .develop
</span><span class="cx">.project
</span><span class="cx">.pydevproject
</span><span class="cx">.trial
</span><span class="cx">.trial.lock
</span><span class="cx">twextpy.egg-info
</span><a id="twexttrunkpython"></a>
<div class="modfile"><h4>Modified: twext/trunk/python (12201 => 12202)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/python 2013-12-23 23:12:19 UTC (rev 12201)
+++ twext/trunk/python 2013-12-23 23:44:54 UTC (rev 12202)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><del>-#!/usr/bin/env bash
</del><ins>+#!/bin/sh
</ins><span class="cx">
</span><ins>+##
+# Copyright (c) 2005-2013 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e
+set -u
+
</ins><span class="cx"> wd="$(cd "$(dirname "$0")" && pwd)";
</span><span class="cx">
</span><span class="cx"> if [ -n "${PYTHON:-}" ]; then
</span><span class="lines">@@ -8,6 +27,22 @@
</span><span class="cx"> python=python;
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>-export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</del><ins>+##
+# Enable development mode
+##
</ins><span class="cx">
</span><ins>+mkdir -p "${wd}/.develop";
+mkdir -p "${wd}/.develop/lib";
+
+export PYTHONPATH="${wd}/.develop/lib:${PYTHONPATH:-}"
+
+cd "${wd}" && ./setup.py develop \
+ -d "${wd}/.develop/lib" \
+ -s "${wd}/.develop/bin" \
+ > "${wd}/.develop/setup.log" 2>&1;
+
+##
+# Run python
+##
+
</ins><span class="cx"> exec "${python}" "$@";
</span></span></pre></div>
<a id="twexttrunksetuppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/setup.py (12201 => 12202)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/setup.py 2013-12-23 23:12:19 UTC (rev 12201)
+++ twext/trunk/setup.py 2013-12-23 23:44:54 UTC (rev 12202)
</span><span class="lines">@@ -104,24 +104,17 @@
</span><span class="cx"> # Dependancies
</span><span class="cx"> #
</span><span class="cx">
</span><del>-requirements = [
</del><ins>+setup_requirements = [
+ "pyflakes",
+]
+
+install_requirements = [
</ins><span class="cx"> "sqlparse==0.1.2",
</span><span class="cx"> "twisted>=13.2.0",
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span><del>-# Write version file
-#
-
-version_string = version()
-version_file = file(joinpath("twext", "version.py"), "w")
-version_file.write('version = "{0}"\n\n'.format(version_string))
-version_file.write("requirements = {0!r}\n".format(requirements))
-version_file.close()
-
-
-#
</del><span class="cx"> # Set up Extension modules that need to be built
</span><span class="cx"> #
</span><span class="cx">
</span><span class="lines">@@ -144,6 +137,22 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> def doSetup():
</span><ins>+ # Write version file
+ version_string = version()
+ version_file = file(joinpath("twext", "version.py"), "w")
+ try:
+ version_file.write(
+ 'version = "{0}"\n\n'.format(version_string)
+ )
+ version_file.write(
+ "setup_requirements = {0!r}\n".format(setup_requirements)
+ )
+ version_file.write(
+ "install_requirements = {0!r}\n".format(install_requirements)
+ )
+ finally:
+ version_file.close()
+
</ins><span class="cx"> setup(
</span><span class="cx"> name="twextpy",
</span><span class="cx"> version=version_string,
</span><span class="lines">@@ -161,7 +170,8 @@
</span><span class="cx"> data_files=[],
</span><span class="cx"> ext_modules=extensions,
</span><span class="cx"> py_modules=[],
</span><del>- install_requires=requirements,
</del><ins>+ setup_requires=setup_requirements,
+ install_requires=install_requirements,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktest"></a>
<div class="addfile"><h4>Added: twext/trunk/test (0 => 12202)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/test (rev 0)
+++ twext/trunk/test 2013-12-23 23:44:54 UTC (rev 12202)
</span><span class="lines">@@ -0,0 +1,147 @@
</span><ins>+#!/bin/sh
+
+##
+# Copyright (c) 2005-2013 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+set -e;
+set -u;
+
+wd="$(cd "$(dirname "$0")" && pwd -L)";
+
+##
+# Options
+##
+
+do_setup="false";
+do_get="false";
+
+random="--random=$(date "+%s")";
+no_color="";
+until_fail="";
+coverage="";
+numjobs="";
+reactor="";
+
+if [ "$(uname -s)" == "Darwin" ]; then
+ reactor="--reactor=kqueue";
+fi;
+
+usage ()
+{
+ program="$(basename "$0")";
+
+ if [ "${1--}" != "-" ]; then echo "$@"; echo; fi;
+
+ echo "Usage: ${program} [options]";
+ echo "Options:";
+ echo " -h Print this help and exit";
+ echo " -n Do not use color";
+ echo " -o Do not run tests in random order.";
+ echo " -r<num> Use specified seed to determine order.";
+ echo " -u Run until the tests fail.";
+ echo " -c Generate coverage reports.";
+
+ if [ "${1-}" == "-" ]; then return 0; fi;
+ exit 64;
+}
+
+while getopts "nhoucr:j:" option; do
+ case "${option}" in
+ '?') usage; ;;
+ 'h') usage -; exit 0; ;;
+ 'o') random=""; ;;
+ 'r') random="--random=$OPTARG"; ;;
+ 'n') no_color="--reporter=bwverbose"; ;;
+ 'u') until_fail="--until-failure"; ;;
+ 'c') coverage="--coverage"; ;;
+ 'j') numjobs="-j $OPTARG"; ;;
+ esac;
+done;
+shift $((${OPTIND} - 1));
+
+if [ $# -gt 0 ]; then
+ test_modules="$@";
+else
+ test_modules="twext";
+fi;
+
+
+##
+# Clean up
+##
+
+find "${wd}" -name \*.pyc -print0 | xargs -0 rm;
+
+
+##
+# Enable development mode
+##
+
+mkdir -p "${wd}/.develop";
+mkdir -p "${wd}/.develop/lib";
+
+export PYTHONPATH="${wd}/.develop/lib:${PYTHONPATH:-}"
+
+cd "${wd}" && ./setup.py develop \
+ -d "${wd}/.develop/lib" \
+ -s "${wd}/.develop/bin" \
+ > "${wd}/.develop/setup.log" 2>&1;
+
+
+##
+# Unit tests
+##
+
+cd "${wd}" && "${wd}/bin/trial" \
+ --temp-directory="${wd}/.trial" \
+ --rterrors \
+ ${reactor} \
+ ${random} \
+ ${until_fail} \
+ ${no_color} \
+ ${coverage} \
+ ${numjobs} \
+ ${test_modules} \
+ ;
+
+
+##
+# Linting
+##
+
+echo "";
+echo "Running pyflakes...";
+tmp="$(mktemp -t "twext_flakes.XXXXX")";
+cd "${wd}" && ./pyflakes ${test_modules} | tee "${tmp}" 2>&1;
+if [ -s "${tmp}" ]; then
+ echo "**** Pyflakes says you have some code to clean up. ****";
+ exit 1;
+fi;
+rm -f "${tmp}";
+
+
+##
+# Empty files
+##
+
+tmp="$(mktemp -t "twext_test_empty.XXXXX")";
+find "${wd}" '!' '(' -type d '(' -path '*/.*' -or -name data -or -name build ')' -prune ')' -type f -size 0 > "${tmp}";
+if [ -s "${tmp}" ]; then
+ echo "**** Empty files: ****";
+ cat "${tmp}";
+ exit 1;
+fi;
+rm -f "${tmp}";
</ins><span class="cx">Property changes on: twext/trunk/test
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>
</body>
</html>