From d363f99ca8cdefaf04601d2003cf512086f94b73 Mon Sep 17 00:00:00 2001 From: Dave Kuhlman <dkuhlman@davekuhlman.org> Date: Tue, 8 May 2018 14:37:48 -0700 Subject: [PATCH] v. 2.29.14. Merged PR from Andrei Fokau: fixes to logging --- README.rst | 6 ++++++ generateDS.py | 2 +- generateDS.txt | 2 +- generateds_gui_notes.txt | 2 +- gui/generateds_gui.py | 2 +- librarytemplate_howto.txt | 2 +- process_includes.py | 2 +- setup.py | 2 +- tutorial/generateds_tutorial.txt | 2 +- 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 6c6bed2..11cf68a 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 9dd9ed4..1d39177 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 c0a5ce1..2721a62 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 ef76705..219acd4 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 9242105..fe1590c 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 e146266..4dd530e 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 6bafd87..dcb074a 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 3375ec3..2ad9c99 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 ff7059c..d5874a8 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 -- GitLab