<!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>[14577] CalendarServer/trunk/setup.py</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/14577">14577</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-12 11:57:07 -0700 (Thu, 12 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add modified qualifier to version.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunksetuppy">CalendarServer/trunk/setup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunksetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/setup.py (14576 => 14577)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py        2015-03-12 18:29:56 UTC (rev 14576)
+++ CalendarServer/trunk/setup.py        2015-03-12 18:57:07 UTC (rev 14577)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> Look up info on a Subversion working copy.
</span><span class="cx"> """
</span><span class="cx"> try:
</span><del>- svn_info_xml = subprocess.check_output(
</del><ins>+ info_xml = subprocess.check_output(
</ins><span class="cx"> ["svn", "info", "--xml", wc_path]
</span><span class="cx"> )
</span><span class="cx"> except OSError as e:
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> except subprocess.CalledProcessError:
</span><span class="cx"> return None
</span><span class="cx">
</span><del>- info = ElementTree.fromstring(svn_info_xml)
</del><ins>+ info = ElementTree.fromstring(info_xml)
</ins><span class="cx"> assert info.tag == "info"
</span><span class="cx">
</span><span class="cx"> entry = info.find("entry")
</span><span class="lines">@@ -81,19 +81,45 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+def svn_status(wc_path):
+ """
+ Look up status on a Subversion working copy.
+ Complies with PEP 440: https://www.python.org/dev/peps/pep-0440/
+
+ Examples:
+ C{6.0} (release tag)
+ C{6.1.b2.dev14564} (release branch)
+ C{7.0.b1.dev14564} (trunk)
+ C{6.0.a1.dev14441+branches.pg8000} (other branch)
+ """
+ try:
+ status_xml = subprocess.check_output(
+ ["svn", "status", "--xml", wc_path]
+ )
+ except OSError as e:
+ if e.errno == errno.ENOENT:
+ return
+ raise
+ except subprocess.CalledProcessError:
+ return
+
+ status = ElementTree.fromstring(status_xml)
+ assert status.tag == "status"
+
+ target = status.find("target")
+
+ for entry in target.findall("entry"):
+ # entry_status = entry.find("wc-status")
+ path = entry.attrib["path"]
+ if wc_path != ".":
+ path = path.lstrip(wc_path)
+ yield dict(path=path)
+
+
</ins><span class="cx"> def version():
</span><span class="cx"> """
</span><span class="cx"> Compute the version number.
</span><span class="cx"> """
</span><del>- # branches = tuple(
- # branch.format(project=project_name, version=base_version)
- # for branch in (
- # "tags/release/{project}-{version}",
- # "branches/release/{project}-{version}-dev",
- # "trunk",
- # )
- # )
-
</del><span class="cx"> source_root = dirname(abspath(__file__))
</span><span class="cx">
</span><span class="cx"> info = svn_info(source_root)
</span><span class="lines">@@ -107,6 +133,16 @@
</span><span class="cx"> .format(info["project"], project_name)
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ status = svn_status(source_root)
+
+ for entry in status:
+ # We have modifications.
+ modified = "+modified"
+ break
+ else:
+ modified = ""
+
+
</ins><span class="cx"> if info["branch"].startswith("tags/release/"):
</span><span class="cx"> project_version = info["branch"].lstrip("tags/release/")
</span><span class="cx"> project, version = project_version.split("-")
</span><span class="lines">@@ -117,7 +153,7 @@
</span><span class="cx"> "Tagged version {!r} != {!r}".format(version, base_version)
</span><span class="cx"> )
</span><span class="cx"> # This is a correctly tagged release of this project.
</span><del>- return "{}".format(base_version)
</del><ins>+ return "{}{}".format(base_version, modified)
</ins><span class="cx">
</span><span class="cx"> if info["branch"].startswith("branches/release/"):
</span><span class="cx"> project_version = info["branch"].lstrip("branches/release/")
</span><span class="lines">@@ -133,16 +169,19 @@
</span><span class="cx"> )
</span><span class="cx"> # This is a release branch of this project.
</span><span class="cx"> # Designate this as beta2, dev version based on svn revision.
</span><del>- return "{}.b2.dev{}".format(base_version, info["revision"])
</del><ins>+ return "{}.b2.dev{}{}".format(base_version, info["revision"], modified)
</ins><span class="cx">
</span><span class="cx"> if info["branch"].startswith("trunk"):
</span><span class="cx"> # This is trunk.
</span><span class="cx"> # Designate this as beta1, dev version based on svn revision.
</span><del>- return "{}.b1.dev{}".format(base_version, info["revision"])
</del><ins>+ return "{}.b1.dev{}{}".format(base_version, info["revision"], modified)
</ins><span class="cx">
</span><span class="cx"> # This is some unknown branch or tag...
</span><del>- return "{}.a1.dev{}+{}".format(
- base_version, info["revision"], info["branch"]
</del><ins>+ return "{}.a1.dev{}+{}{}".format(
+ base_version,
+ info["revision"],
+ info["branch"].replace("/", "."),
+ modified.replace("+", "."),
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>