<!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>[14591] twext/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/14591">14591</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-13 15:31:51 -0700 (Fri, 13 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>update setup.py with pep440 version</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunksetuppy">twext/trunk/setup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunksetuppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/setup.py (14590 => 14591)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/setup.py 2015-03-13 20:45:32 UTC (rev 14590)
+++ twext/trunk/setup.py 2015-03-13 22:31:51 UTC (rev 14591)
</span><span class="lines">@@ -18,28 +18,33 @@
</span><span class="cx">
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><ins>+import os
</ins><span class="cx"> from os.path import dirname, abspath, join as joinpath
</span><del>-from setuptools import setup, find_packages as setuptools_find_packages
-import errno
-import os
</del><span class="cx"> import subprocess
</span><span class="cx"> import sys
</span><span class="cx">
</span><ins>+import errno
+from setuptools import setup, find_packages as setuptools_find_packages
+from xml.etree import ElementTree
</ins><span class="cx">
</span><ins>+base_version = "0.1"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Utilities
</span><span class="cx"> #
</span><del>-
</del><span class="cx"> def find_packages():
</span><span class="cx"> modules = [
</span><span class="cx"> "twisted.plugins",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>- for pkg in filter(
- lambda p: os.path.isdir(p) and os.path.isfile(os.path.join(p, "__init__.py")),
- os.listdir(".")
- ):
</del><ins>+ def is_package(path):
+ return (
+ os.path.isdir(path) and
+ os.path.isfile(os.path.join(path, "__init__.py"))
+ )
+
+ for pkg in filter(is_package, os.listdir(".")):
</ins><span class="cx"> modules.extend([pkg, ] + [
</span><span class="cx"> "{}.{}".format(pkg, subpkg)
</span><span class="cx"> for subpkg in setuptools_find_packages(pkg)
</span><span class="lines">@@ -47,70 +52,157 @@
</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><ins>+ try:
+ info_xml = subprocess.check_output(
+ ["svn", "info", "--xml", wc_path],
+ stderr=subprocess.STDOUT,
+ )
+ except OSError as e:
+ if e.errno == errno.ENOENT:
+ return None
+ raise
+ except subprocess.CalledProcessError:
+ return None
</ins><span class="cx">
</span><del>- base_version = "0.1"
</del><ins>+ info = ElementTree.fromstring(info_xml)
+ assert info.tag == "info"
</ins><span class="cx">
</span><del>- branches = tuple(
- branch.format(
- project="twext",
- version=base_version,
- )
- for branch in (
- "tags/release/{project}-{version}",
- "branches/release/{project}-{version}-dev",
- "trunk",
- )
</del><ins>+ entry = info.find("entry")
+ url = entry.find("url")
+ root = entry.find("repository").find("root")
+ if url.text.startswith(root.text):
+ location = url.text[len(root.text):].strip("/")
+ else:
+ location = url.text.strip("/")
+ project, branch = location.split("/")
+
+ return dict(
+ root=root.text,
+ project=project, branch=branch,
+ revision=info.find("entry").attrib["revision"],
</ins><span class="cx"> )
</span><span class="cx">
</span><del>- source_root = dirname(abspath(__file__))
</del><span class="cx">
</span><del>- for branch in branches:
- cmd = ["svnversion", "-n", source_root, branch]
</del><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/
</ins><span class="cx">
</span><del>- try:
- svn_revision = subprocess.check_output(cmd)
</del><ins>+ 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
</ins><span class="cx">
</span><del>- except OSError as e:
- if e.errno == errno.ENOENT:
- full_version = base_version + "-unknown"
- break
- raise
</del><ins>+ status = ElementTree.fromstring(status_xml)
+ assert status.tag == "status"
</ins><span class="cx">
</span><del>- if "S" in svn_revision:
- continue
</del><ins>+ target = status.find("target")
</ins><span class="cx">
</span><del>- full_version = base_version
</del><ins>+ for entry in target.findall("entry"):
+ entry_status = entry.find("wc-status")
+ if entry_status is not None:
+ item = entry_status.attrib["item"]
+ if item == "unversioned":
+ continue
+ path = entry.attrib["path"]
+ if wc_path != ".":
+ path = path.lstrip(wc_path)
+ yield dict(path=path)
</ins><span class="cx">
</span><del>- if branch == "trunk":
- full_version += "b.trunk"
- elif branch.endswith("-dev"):
- full_version += "c.dev"
</del><span class="cx">
</span><del>- if svn_revision in ("exported", "Unversioned directory"):
- full_version += "-unknown"
- else:
- full_version += "-r{revision}".format(revision=svn_revision)
</del><ins>+def version():
+ """
+ Compute the version number.
+ """
+ source_root = dirname(abspath(__file__))
</ins><span class="cx">
</span><ins>+ info = svn_info(source_root)
+ print(info)
+
+ if info is None:
+ # We don't have Subversion info...
+ return "{}.a1+unknown".format(base_version)
+
+ assert info["project"] == project_name, (
+ "Subversion project {!r} != {!r}"
+ .format(info["project"], project_name)
+ )
+
+ status = svn_status(source_root)
+
+ for entry in status:
+ # We have modifications.
+ modified = "+modified"
</ins><span class="cx"> break
</span><span class="cx"> else:
</span><del>- full_version = base_version
- full_version += "a.unknown"
- full_version += "-r{revision}".format(revision=svn_revision)
</del><ins>+ modified = ""
</ins><span class="cx">
</span><del>- return full_version
</del><span class="cx">
</span><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, modified)
</ins><span class="cx">
</span><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"], modified)
</ins><span class="cx">
</span><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"], modified)
+
+ # This is some unknown branch or tag...
+ return "{}.a1.dev{}+{}{}".format(
+ base_version,
+ info["revision"],
+ info["branch"].replace("/", "."),
+ modified.replace("+", "."),
+ )
+
+
+
+
</ins><span class="cx"> #
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="cx">
</span><del>-name = "twextpy"
</del><ins>+project_name = "twextpy"
</ins><span class="cx">
</span><span class="cx"> description = "Extensions to Twisted"
</span><span class="cx">
</span><span class="lines">@@ -207,7 +299,7 @@
</span><span class="cx"> version_file.close()
</span><span class="cx">
</span><span class="cx"> 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>