<!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>[14570] 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/14570">14570</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-11 18:39:48 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rework versioning logic again</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 (14569 => 14570)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/setup.py 2015-03-11 23:52:22 UTC (rev 14569)
+++ CalendarServer/trunk/setup.py 2015-03-12 01:39:48 UTC (rev 14570)
</span><span class="lines">@@ -23,8 +23,11 @@
</span><span class="cx"> import errno
</span><span class="cx"> import os
</span><span class="cx"> import subprocess
</span><ins>+from xml.etree import ElementTree
</ins><span class="cx">
</span><ins>+base_version = "7.0"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Utilities
</span><span class="cx"> #
</span><span class="lines">@@ -47,93 +50,108 @@
</span><span class="cx"> return modules
</span><span class="cx">
</span><span class="cx">
</span><del>-
-def version():
</del><ins>+def svn_info(wc_path):
</ins><span class="cx"> """
</span><del>- Compute the version number.
</del><ins>+ Look up info on a Subversion working copy.
</ins><span class="cx"> """
</span><del>- base_version = "7.0"
-
- branches = tuple(
- branch.format(
- project="CalendarServer",
- version=base_version,
</del><ins>+ try:
+ svn_info_xml = subprocess.check_output(
+ ["svn", "info", "--xml", wc_path]
</ins><span class="cx"> )
</span><del>- for branch in (
- "tags/release/{project}-{version}",
- "branches/release/{project}-{version}-dev",
- "trunk",
- )
- )
</del><ins>+ except OSError as e:
+ if e.errno == errno.ENOENT:
+ return None
+ raise
+ except subprocess.CalledProcessError:
+ return None
</ins><span class="cx">
</span><del>- source_root = dirname(abspath(__file__))
</del><ins>+ info = ElementTree.fromstring(svn_info_xml)
+ assert info.tag == "info"
</ins><span class="cx">
</span><ins>+ entry = info.find("entry")
+ url = entry.find("url")
+ root = entry.find("repository").find("root")
+ location = url.text.lstrip(root.text)
+ project, branch = location.split("/", 1)
</ins><span class="cx">
</span><del>- for branch in branches:
- cmd = ["svnversion", "-n", source_root, branch]
</del><ins>+ return dict(
+ root=root.text,
+ project=project, branch=branch,
+ revision=info.find("entry").attrib["revision"],
+ )
</ins><span class="cx">
</span><del>- try:
- svn_revision = subprocess.check_output(cmd)
</del><span class="cx">
</span><del>- except OSError as e:
- if e.errno == errno.ENOENT:
- svn_revision = None
- break
- raise
</del><ins>+def version():
+ """
+ Compute the version number.
+ """
+ # branches = tuple(
+ # branch.format(project=project_name, version=base_version)
+ # for branch in (
+ # "tags/release/{project}-{version}",
+ # "branches/release/{project}-{version}-dev",
+ # "trunk",
+ # )
+ # )
</ins><span class="cx">
</span><del>- if "S" in svn_revision:
- continue
</del><ins>+ source_root = dirname(abspath(__file__))
</ins><span class="cx">
</span><del>- if svn_revision in ("exported", "Unversioned directory"):
- svn_revision_filename = joinpath(
- dirname(__file__), "svnversion.txt"
- )
- try:
- svn_revision_file = file(svn_revision_filename)
- svn_revision = svn_revision_file.read().strip()
- except (IOError, OSError):
- svn_revision = None
</del><ins>+ info = svn_info(source_root)
</ins><span class="cx">
</span><del>- # If there are uncommitted changes, append "+modified"
- if svn_revision.endswith("M"):
- local_version = "+modified"
- svn_revision = svn_revision[:-1]
- else:
- local_version = ""
</del><ins>+ if info is None:
+ # We don't have Subversion info...
+ return "{}.a1+unknown".format(base_version)
</ins><span class="cx">
</span><del>- if branch.startswith("tags/release/"):
- full_version = "{}{}".format(base_version, local_version)
</del><ins>+ assert info["project"] == project_name, (
+ "Subversion project {!r} != {!r}"
+ .format(info["project"], project_name)
+ )
</ins><span class="cx">
</span><del>- elif branch == "trunk":
- if svn_revision is not None:
- full_version = "{}a{}".format(base_version, svn_revision)
- else:
- full_version = "{}a".format(base_version)
</del><ins>+ if info["branch"].startswith("tags/release/"):
+ project_version = info["branch"].lstrip("tags/release/")
+ project, version = project_version.split("-")
+ assert project == project_name, (
+ "Tagged project {!r} != {!r}".format(project, project_name)
+ )
+ assert version == base_version, (
+ "Tagged version {!r} != {!r}".format(version, base_version)
+ )
+ # This is a correctly tagged release of this project.
+ return "{}".format(base_version)
</ins><span class="cx">
</span><del>- full_version += local_version
</del><ins>+ if info["branch"].startswith("branches/release/"):
+ project_version = info["branch"].lstrip("branches/release/")
+ project, version, dev = project_version.split("-")
+ assert project == project_name, (
+ "Branched project {!r} != {!r}".format(project, project_name)
+ )
+ assert version == base_version, (
+ "Branched version {!r} != {!r}".format(version, base_version)
+ )
+ assert dev == "dev", (
+ "Branch name doesn't end in -dev: {!r}".format(info["branch"])
+ )
+ # This is a release branch of this project.
+ # Designate this as beta2, dev version based on svn revision.
+ return "{}.b2.dev{}".format(base_version, info["revision"])
</ins><span class="cx">
</span><del>- elif branch.endswith("-dev"):
- full_version = "{}b{}".format(base_version, svn_revision)
</del><ins>+ if info["branch"].startswith("trunk"):
+ # This is trunk.
+ # Designate this as beta1, dev version based on svn revision.
+ return "{}.b1.dev{}".format(base_version, info["revision"])
</ins><span class="cx">
</span><del>- full_version += local_version
</del><ins>+ # This is some unknown branch or tag...
+ return "{}.a1.dev{}+{}".format(
+ base_version, info["revision"], info["branch"]
+ )
</ins><span class="cx">
</span><del>- else:
- raise Exception("??")
</del><span class="cx">
</span><del>- break
</del><span class="cx">
</span><del>- else:
- full_version = "{}a.dev{}+unknown".format(base_version, svn_revision)
-
- return full_version
-
-
-
</del><span class="cx"> #
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="cx">
</span><del>-name = "CalendarServer"
</del><ins>+project_name = "CalendarServer"
</ins><span class="cx">
</span><span class="cx"> description = "Calendar and Contacts Server"
</span><span class="cx">
</span><span class="lines">@@ -320,7 +338,7 @@
</span><span class="cx"> version_file.close()
</span><span class="cx">
</span><span class="cx"> dist = setup(
</span><del>- name=name,
</del><ins>+ name=project_name,
</ins><span class="cx"> version=version_string,
</span><span class="cx"> description=description,
</span><span class="cx"> long_description=long_description,
</span></span></pre>
</div>
</div>
</body>
</html>