dabo Commit
Revision 7302
Date: 2013-01-01 17:02:04 -0800 (Tue, 01 Jan 2013)
Author: Paul
Trac: http://trac.dabodev.com/changeset/7302
Changed:
U trunk/dabo/__init__.py
D trunk/dabo/__version__.py
U trunk/dabo/ui/uiwx/__init__.py
U trunk/dabo/ui/uiwx/uiApp.py
Log:
Removed subversion revision information from Dabo in preparation for
the transition to Git.
Some work is needed to change the web update code appropriately; in
the meantime, I've left dabo.version["file_revision"] = "7300".
When on Git, all merges into master from the working branch will
generate a new minor version (0.9.6, for example). This action will
in turn generate a new Web Update version. There's no need for a
Subversion-like revision number.
Diff:
Modified: trunk/dabo/__init__.py
===================================================================
--- trunk/dabo/__init__.py 2012-12-30 04:46:02 UTC (rev 7301)
+++ trunk/dabo/__init__.py 2013-01-02 01:02:04 UTC (rev 7302)
@@ -81,7 +81,12 @@
import logging
import logging.handlers
from settings import *
+from version import __version__
+## Temporary: until we are on Git and WebUpdate no longer relies on
+## dabo.version["file_revision"]:
+version = dict(file_revision="7300")
+
# dApp will change the following values upon its __init__:
dAppRef = None
@@ -283,7 +288,6 @@
import __builtin__
__builtin__.debugo = __builtin__.debugout = debugout
-from __version__ import version
if implicitImports:
import dColors
import dEvents
Deleted: trunk/dabo/__version__.py
Modified: trunk/dabo/ui/uiwx/__init__.py
===================================================================
--- trunk/dabo/ui/uiwx/__init__.py 2012-12-30 04:46:02 UTC (rev 7301)
+++ trunk/dabo/ui/uiwx/__init__.py 2013-01-02 01:02:04 UTC (rev 7302)
@@ -1219,8 +1219,7 @@
else:
appVersion = "?"
appName = "Dabo"
- ds.append({"name": "Dabo Version:", "value": "Version %s; Revision %s"
- % (dabo.version["version"], dabo.version["revision"])})
+ ds.append({"name": "Dabo Version:", "value": dabo.__version__})
ds.append({"name": "UI Version:", "value": "%s on %s" %
(dabo.ui.uiType["version"],
dabo.ui.uiType["platform"])})
if rType == "d":
Modified: trunk/dabo/ui/uiwx/uiApp.py
===================================================================
--- trunk/dabo/ui/uiwx/uiApp.py 2012-12-30 04:46:02 UTC (rev 7301)
+++ trunk/dabo/ui/uiwx/uiApp.py 2013-01-02 01:02:04 UTC (rev 7302)
@@ -313,7 +313,7 @@
title=_("No Update
Needed"))
answer = False
else:
- dabo.ui.info(_("Dabo has been updated
to the current revision. The app "
+ dabo.ui.info(_("Dabo has been updated
to the current master version. The app "
"will now exit. Please
re-run the application."), title=_("Success!"))
return not answer
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://mail.leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
