[CalendarServer-changes] [14610] twext/trunk/setup.py

[source_changes at macosforge.org]

Revision: 14610
          http://trac.calendarserver.org//changeset/14610
Author:   wsanchez at apple.com
Date:     2015-03-26 11:14:08 -0700 (Thu, 26 Mar 2015)
Log Message:
-----------
sync

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

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2015-03-26 17:59:13 UTC (rev 14609)
+++ twext/trunk/setup.py	2015-03-26 18:14:08 UTC (rev 14610)
@@ -75,10 +75,10 @@
     url = entry.find("url")
     root = entry.find("repository").find("root")
     if url.text.startswith(root.text):
-        location = url.text[len(root.text):].strip("/")
+        location = url.text[len(root.text):]
     else:
-        location = url.text.strip("/")
-    project, branch = location.split("/")
+        location = url.text
+    project, branch = location.strip("/").split("/")
 
     return dict(
         root=root.text,
@@ -144,16 +144,6 @@
         .format(info["project"], project_name)
     )
 
-    status = svn_status(source_root)
-
-    for entry in status:
-        # We have modifications.
-        modified = "+modified"
-        break
-    else:
-        modified = ""
-
-
     if info["branch"].startswith("tags/release/"):
         project_version = info["branch"][len("tags/release/"):]
         project, version = project_version.split("-")
@@ -164,7 +154,7 @@
             "Tagged version {!r} != {!r}".format(version, base_version)
         )
         # This is a correctly tagged release of this project.
-        return "{}{}".format(base_version, modified)
+        return base_version
 
     if info["branch"].startswith("branches/release/"):
         project_version = info["branch"][len("branches/release/"):]
@@ -180,24 +170,22 @@
         )
         # 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)
+        return "{}.b2.dev{}".format(base_version, info["revision"])
 
     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)
+        return "{}.b1.dev{}".format(base_version, info["revision"])
 
     # This is some unknown branch or tag...
-    return "{}.a1.dev{}+{}{}".format(
+    return "{}.a1.dev{}+{}".format(
         base_version,
         info["revision"],
         info["branch"].replace("/", "."),
-        modified.replace("+", "."),
     )
 
 
 
-
 #
 # Options
 #
@@ -232,6 +220,16 @@
 
 
 #
+# Entry points
+#
+
+entry_points = {
+    "console_scripts": [],
+}
+
+
+
+#
 # Dependencies
 #
 
@@ -265,12 +263,8 @@
 # Set up Extension modules that need to be built
 #
 
-# from distutils.core import Extension
+extensions = []
 
-extensions = [
-    # Extension("twext.python.sendmsg", sources=["twext/python/sendmsg.c"])
-]
-
 if sys.platform == "darwin":
     try:
         from twext.python import launchd
@@ -281,7 +275,6 @@
         pass
 
 
-
 #
 # Run setup
 #
@@ -289,8 +282,11 @@
 def doSetup():
     # Write version file
     version_string = version()
-    version_filename = joinpath(dirname(__file__), "twext", "version.py")
+    version_filename = joinpath(
+        dirname(__file__), "twext", "version.py"
+    )
     version_file = file(version_filename, "w")
+
     try:
         version_file.write(
             'version = "{0}"\n\n'.format(version_string)
@@ -311,6 +307,7 @@
         platforms=platforms,
         packages=find_packages(),
         package_data={},
+        entry_points=entry_points,
         scripts=[],
         data_files=[],
         ext_modules=extensions,
@@ -321,6 +318,7 @@
     )
 
 
+
 #
 # Main
 #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150326/e82eddd9/attachment.html>