diff --git a/README.rst b/README.rst index 6c6bed231907c75acc0089651da69b84d6ac9cb6..11cf68a1cd0ab6430671640cf7c7da2215e97d82 100644 --- a/README.rst +++ b/README.rst @@ -141,6 +141,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Change history -------------- +Version 2.29.14 (05/08/2018) + +- Fixes to logging in generateDS.py -- (1) Setup logging only when + running as script. (2) Use named logger instead of root one. + Thanks to Andrei Fokau for this fix. + Version 2.29.13 (05/08/2018) - Merged PR from Andrei Fokau. Fix tests by striping varying lines. diff --git a/generateDS.py b/generateDS.py index 9dd9ed43a58ec443b3db1ccb1af7500d1f34e123..1d3917735c4d101049c839a32a7b8ef7e202264b 100755 --- a/generateDS.py +++ b/generateDS.py @@ -225,7 +225,7 @@ _log = logging.getLogger(__name__) # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.29.13' +VERSION = '2.29.14' ##VERSION## BaseStrTypes = six.string_types diff --git a/generateDS.txt b/generateDS.txt index c0a5ce128199d1f0464a4f8131dcdcad12b711c5..2721a6268e0c651bb7b8f9c68f85dcb59fbe71f9 100644 --- a/generateDS.txt +++ b/generateDS.txt @@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema .. version -:revision: 2.29.13 +:revision: 2.29.14 .. version diff --git a/generateds_gui_notes.txt b/generateds_gui_notes.txt index ef76705a3a82ee9a7db5bf7c76b41d64e26a0a57..219acd4776cc9d219b1a1b47b65d1844b533a1c6 100644 --- a/generateds_gui_notes.txt +++ b/generateds_gui_notes.txt @@ -12,7 +12,7 @@ GenerateDS GUI Notes .. version -:revision: 2.29.13 +:revision: 2.29.14 .. version diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py index 9242105fce889230dccd8f54dbc2fd95ceb275cb..fe1590c42a14ddb3c1afa6a122fa5166b39ee06d 100644 --- a/gui/generateds_gui.py +++ b/gui/generateds_gui.py @@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.29.13' +VERSION = '2.29.14' ##VERSION## diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt index e146266811360b666f567fd234ac0538fa1eed5a..4dd530e1b97028a79913d1f3a52a6d54280aa3c8 100644 --- a/librarytemplate_howto.txt +++ b/librarytemplate_howto.txt @@ -8,7 +8,7 @@ How to package a generateDS.py generated library .. version -:revision: 2.29.13 +:revision: 2.29.14 .. version diff --git a/process_includes.py b/process_includes.py index 6bafd8718498b7d13fcbee71bb80c63bf6644cc3..dcb074ab389a4ffb45372806d30aa2fd07675d7f 100755 --- a/process_includes.py +++ b/process_includes.py @@ -40,7 +40,7 @@ except ImportError: # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.29.13' +VERSION = '2.29.14' ##VERSION## CatalogDict = {} diff --git a/setup.py b/setup.py index 3375ec3bd2fc8c8f0ea8546846f7dad30e96b91a..2ad9c994008c00422cd6cd989a9850f6e3e465e8 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup(name="generateDS", # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## - version="2.29.13", + version="2.29.14", ##VERSION## author="Dave Kuhlman", author_email="dkuhlman@davekuhlman.org", diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt index ff7059c36fa81f7ca230c86764ffaa143b86a932..d5874a878fb3005a88b52e0f39dbf508afd74dd6 100644 --- a/tutorial/generateds_tutorial.txt +++ b/tutorial/generateds_tutorial.txt @@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial .. version -:revision: 2.29.13 +:revision: 2.29.14 .. version