<!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>[12195] 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/12195">12195</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-23 14:21:38 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make version string setuptools-compliant.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunksetuppy">twext/trunk/setup.py</a></li>
<li><a href="#twexttrunksupportversionpy">twext/trunk/support/version.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunksetuppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/setup.py (12194 => 12195)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/setup.py 2013-12-23 22:15:53 UTC (rev 12194)
+++ twext/trunk/setup.py 2013-12-23 22:21:38 UTC (rev 12195)
</span><span class="lines">@@ -64,14 +64,9 @@
</span><span class="cx"> # Write version file
</span><span class="cx"> #
</span><span class="cx">
</span><del>-version_number, version_info = version()
-
-version_string = (
- "{number} ({info})"
- .format(number=version_number, info=version_info)
-)
</del><ins>+version_string = version()
</ins><span class="cx"> version_file = file(os.path.join("twext", "version.py"), "w")
</span><del>-version_file.write('version = "{version}"\n'.format(version=version_string))
</del><ins>+version_file.write('version = "{0}"\n'.format(version_string))
</ins><span class="cx"> version_file.close()
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunksupportversionpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/support/version.py (12194 => 12195)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/support/version.py 2013-12-23 22:15:53 UTC (rev 12194)
+++ twext/trunk/support/version.py 2013-12-23 22:21:38 UTC (rev 12195)
</span><span class="lines">@@ -18,7 +18,8 @@
</span><span class="cx">
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><del>-from os.path import dirname
</del><ins>+from os import chdir
+from os.path import dirname, abspath
</ins><span class="cx"> import subprocess
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -42,38 +43,40 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- source_root = dirname(dirname(__file__))
</del><ins>+ source_root = dirname(dirname(abspath(__file__)))
+ chdir(source_root)
</ins><span class="cx">
</span><span class="cx"> for branch in branches:
</span><del>- svn_revision = subprocess.check_output(
- ["svnversion", "-n", source_root, branch]
- )
</del><ins>+ cmd = ["svnversion", "-n", source_root, branch]
+ svn_revision = subprocess.check_output(cmd)
</ins><span class="cx">
</span><span class="cx"> if "S" in svn_revision:
</span><span class="cx"> continue
</span><span class="cx">
</span><ins>+ full_version = base_version
+
</ins><span class="cx"> if branch == "trunk":
</span><del>- base_version += "-trunk"
</del><ins>+ full_version += "b.trunk"
</ins><span class="cx"> elif branch.endswith("-dev"):
</span><del>- base_version += "-dev"
</del><ins>+ full_version += "c.dev"
</ins><span class="cx">
</span><span class="cx"> if svn_revision in ("exported", "Unversioned directory"):
</span><del>- comment = "unknown"
</del><ins>+ full_version += "-unknown"
</ins><span class="cx"> else:
</span><del>- comment = "r{revision}".format(revision=svn_revision)
</del><ins>+ full_version += "-r{revision}".format(revision=svn_revision)
</ins><span class="cx">
</span><span class="cx"> break
</span><span class="cx"> else:
</span><del>- base_version += "-unknown"
- comment = "r{revision}".format(revision=svn_revision)
</del><ins>+ full_version += "a.unknown"
+ full_version += "-r{revision}".format(revision=svn_revision)
</ins><span class="cx">
</span><del>- return (base_version, comment)
</del><ins>+ return full_version
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if __name__ == "__main__":
</span><del>- base_version, comment = version()
</del><ins>+ base_version = version()
</ins><span class="cx"> print(
</span><del>- "{version} ({comment})"
- .format(version=base_version, comment=comment)
</del><ins>+ "{version}"
+ .format(version=base_version)
</ins><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>