[CalendarServer-changes] [14560] CalendarServer/trunk/setup.py

[source_changes at macosforge.org]

Revision: 14560
          http://trac.calendarserver.org//changeset/14560
Author:   sagen at apple.com
Date:     2015-03-11 13:58:55 -0700 (Wed, 11 Mar 2015)
Log Message:
-----------
Approach PEP440-ness

Modified Paths:
--------------
    CalendarServer/trunk/setup.py

Modified: CalendarServer/trunk/setup.py
===================================================================
--- CalendarServer/trunk/setup.py	2015-03-11 18:00:51 UTC (rev 14559)
+++ CalendarServer/trunk/setup.py	2015-03-11 20:58:55 UTC (rev 14560)
@@ -52,12 +52,11 @@
     """
     Compute the version number.
     """
-
     base_version = "7.0"
 
     branches = tuple(
         branch.format(
-            project="twext",
+            project="CalendarServer",
             version=base_version,
         )
         for branch in (
@@ -69,7 +68,6 @@
 
     source_root = dirname(abspath(__file__))
 
-    full_version = base_version
 
     for branch in branches:
         cmd = ["svnversion", "-n", source_root, branch]
@@ -86,11 +84,6 @@
         if "S" in svn_revision:
             continue
 
-        if branch == "trunk":
-            full_version += "b.trunk"
-        elif branch.endswith("-dev"):
-            full_version += "c.dev"
-
         if svn_revision in ("exported", "Unversioned directory"):
             svn_revision_filename = joinpath(
                 dirname(__file__), "svnversion.txt"
@@ -101,15 +94,36 @@
             except (IOError, OSError):
                 svn_revision = None
 
+        # If there are uncommitted changes, append "+modified"
+        if svn_revision.endswith("M"):
+            local_version = "+modified"
+            svn_revision = svn_revision[:-1]
+        else:
+            local_version = ""
+
+        if branch.startswith("tags/release/"):
+            full_version = "{}{}".format(base_version, local_version)
+
+        elif branch == "trunk":
+            if svn_revision is not None:
+                full_version = "{}a{}".format(base_version, svn_revision)
+            else:
+                full_version = "{}a".format(base_version)
+
+            full_version += local_version
+
+        elif branch.endswith("-dev"):
+            full_version = "{}b{}".format(base_version, svn_revision)
+
+            full_version += local_version
+
+        else:
+            raise Exception("??")
+
         break
-    else:
-        full_version = base_version
-        full_version += "a.unknown"
 
-    if svn_revision is None:
-        full_version += "-unknown"
     else:
-        full_version += "-r{revision}".format(revision=svn_revision)
+        full_version = "{}a.dev{}+unknown".format(base_version, svn_revision)
 
     return full_version
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150311/889da7c3/attachment.html>