diff --git a/buildVersion.py b/buildVersion.py index 6f1e9b369de5e7e94396e173da67c87e59c8e5d8..ce4f12c87be001526f61110a92e0cf2daf6103e0 100755 --- a/buildVersion.py +++ b/buildVersion.py @@ -80,14 +80,6 @@ def epydoc(): if not os.path.exists(PYDOC): os.makedirs(PYDOC) - # inhibit the __init__.py files - # to avoid long modules path in the documentation - if os.path.exists("__init__.py"): - os.rename("__init__.py", "__init__.py.ref") - - if os.path.exists("modules/__init__.py"): - os.rename("modules/__init__.py", "modules/__init__.py.ref") - # clean the directory cmd = ["rm", "-rf", PYDOC] subprocess.call(cmd) @@ -103,13 +95,6 @@ def epydoc(): subprocess.call(cmd) - # restore the __init__.py files - if os.path.exists("__init__.py.ref"): - os.rename("__init__.py.ref", "__init__.py") - - if os.path.exists("modules/__init__.py.ref"): - os.rename("modules/__init__.py.ref", "modules/__init__.py") - print "HTML documentation in", PYDOC @@ -290,7 +275,9 @@ def set_version(version): subprocess.call(["vim", CHANGELOG]) # cleaning - os.remove("%s~" % CHANGELOG ) + fn = "%s~" % CHANGELOG + if os.path.exists(fn): + os.remove(fn) def web2py(): diff --git a/static/plugin_dbui/CHANGELOG b/static/plugin_dbui/CHANGELOG index 0abca4b10b939f1f5e28735432db51dc4d45f75b..61815a4e484729965448d417e8873a9660cf000d 100644 --- a/static/plugin_dbui/CHANGELOG +++ b/static/plugin_dbui/CHANGELOG @@ -2,8 +2,11 @@ HEAD - - Use inline script and Ext.grid.Panel to display software versions. +0.6.1.7 (Sep 2014) + - Use inline script and Ext.grid.Panel to display software versions + as well as documentation. - Migrate to HTML5 sysntax. + - Remove some obsolete code and import. 0.6.1.6 (Jul 2014) - Add protection to avoid Direct transaction with null TableId identifier diff --git a/static/plugin_dbui/src/App.js b/static/plugin_dbui/src/App.js index 60b8cda898648b1bd1bfb4058f2e64f1c6051a00..af7d3a0e0c3f388d728be6be632d97ec03099991 100644 --- a/static/plugin_dbui/src/App.js +++ b/static/plugin_dbui/src/App.js @@ -15,7 +15,7 @@ Ext.define('App', { * The version of the plugin * @property {String} */ - version: '0.6.1.6', + version: '0.6.1.7', /** * The name of the application