diff --git a/README b/README index 2c7f27b26cf0c0719b8edb7f0a858ca1f73406ef..9eeca0dd6ab2ea0a20322f8b48b91f4a2b16de29 100644 --- a/README +++ b/README @@ -141,7 +141,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Change history -------------- -Version 2.19c (02/25/2016) +Version 2.20a (02/25/2016) - Another patch for Python 2 and 3. We needed to protect against performing an encoding that caused an exception in generateDS.py diff --git a/generateDS.html b/generateDS.html index c456395c80c54f253f02ab6e85f217a5c3142c5c..22537759fa1e83307072287594cbec1699a47bbb 100644 --- a/generateDS.html +++ b/generateDS.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> <title>generateDS -- Generate Data Structures from XML Schema</title> <meta name="author" content="Dave Kuhlman" /> <style type="text/css"> @@ -220,7 +220,7 @@ They are used by updateversion.py. --> <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.19b</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.20a</td> </tr> </tbody> </table> @@ -229,7 +229,7 @@ They are used by updateversion.py. --> <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">date:</th><td class="field-body">February 16, 2016</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">February 25, 2016</td> </tr> </tbody> </table> @@ -3171,7 +3171,7 @@ following among others:</p> <div class="footer"> <hr class="footer" /> <a class="reference external" href="generateDS.txt">View document source</a>. -Generated on: 2016-02-16 20:53 UTC. +Generated on: 2016-02-26 00:54 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> diff --git a/generateDS.py b/generateDS.py index 6ba42bf31884d7db5f280695e091d47fde199761..2d90b8f3589b1265e694359e9b6814db28338a51 100755 --- a/generateDS.py +++ b/generateDS.py @@ -202,7 +202,7 @@ logging.disable(logging.INFO) # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.19c' +VERSION = '2.20a' ##VERSION## if sys.version_info.major == 2: diff --git a/generateDS.txt b/generateDS.txt index 2a820d50f41429973d01319b76a47c6d7f811dcb..c83f3318524a2c786d2db264bde2f9aa006ae083 100644 --- a/generateDS.txt +++ b/generateDS.txt @@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema .. version -:revision: 2.19c +:revision: 2.20a .. version diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py index 87693faabae2d25ea0af0508771c271efdf37089..8005633514af658ca1b931a1eab56a3083009721 100755 --- a/gui/generateds_gui.py +++ b/gui/generateds_gui.py @@ -31,7 +31,7 @@ from libgenerateDS.gui import generateds_gui_session # Do not modify the following VERSION comments. # Used by updateversion.py. ##VERSION## -VERSION = '2.19c' +VERSION = '2.20a' ##VERSION## diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html index b7797186e39827c44b27546ad87f3bdde5a07e03..7ba967b52f7a3106a4c3378bcc9c7cc53447faaf 100644 --- a/librarytemplate_howto.html +++ b/librarytemplate_howto.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> <title>How to package a generateDS.py generated library</title> <meta name="author" content="Dave Kuhlman" /> <style type="text/css"> @@ -217,7 +217,7 @@ dkuhlman (at) davekuhlman (dot) org <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.19b</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.20a</td> </tr> </tbody> </table> @@ -226,7 +226,7 @@ dkuhlman (at) davekuhlman (dot) org <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">date:</th><td class="field-body">February 16, 2016</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">February 25, 2016</td> </tr> </tbody> </table> @@ -380,7 +380,7 @@ this command for your needs. For example, you may need to use <div class="footer"> <hr class="footer" /> <a class="reference external" href="librarytemplate_howto.txt">View document source</a>. -Generated on: 2016-02-16 20:53 UTC. +Generated on: 2016-02-26 00:54 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt index f7195fcfa36eff73042c920324773827ced34abd..4abf50f23aa2de2199d4923e82cddcbb7a74e281 100644 --- a/librarytemplate_howto.txt +++ b/librarytemplate_howto.txt @@ -8,7 +8,7 @@ How to package a generateDS.py generated library .. version -:revision: 2.19c +:revision: 2.20a .. version diff --git a/process_includes.py b/process_includes.py index 8293fd491d89597886ac92bbc5e1b8212c43b3a9..c4f5e57ab31f0e939efa32bf26f68f70a3f5c13f 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.19c' +VERSION = '2.20a' ##VERSION## CatalogDict = {} diff --git a/setup.py b/setup.py index cb8b843f2db57fd672a223098c275b59f1537873..6f9c281f31c6a4dfb811eef578907fce078c366a 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.19c", + version="2.20a", ##VERSION## author="Dave Kuhlman", author_email="dkuhlman@davekuhlman.org", diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html index 9b7a8fd8372656075cbfcdf2dfa756127cab979d..dde286bc104fc9eeccce6e6d295f01581688ff8f 100644 --- a/tutorial/generateds_tutorial.html +++ b/tutorial/generateds_tutorial.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" /> <title>generateDS -- Introduction and Tutorial</title> <meta name="author" content="Dave Kuhlman" /> <style type="text/css"> @@ -219,7 +219,7 @@ They are used by updateversion.py. --> <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.19b</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.20a</td> </tr> </tbody> </table> @@ -228,7 +228,7 @@ They are used by updateversion.py. --> <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">date:</th><td class="field-body">February 16, 2016</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">February 25, 2016</td> </tr> </tbody> </table> @@ -1210,7 +1210,7 @@ named <tt class="docutils literal">garden_api.py</tt>, you can create an instanc <div class="footer"> <hr class="footer" /> <a class="reference external" href="generateds_tutorial.txt">View document source</a>. -Generated on: 2016-02-16 20:53 UTC. +Generated on: 2016-02-26 00:54 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt index 6aa62039cf489af121e898967d72d3b63683ae3e..c2e27d55a9d33565c91acb79eb04f1b3f4b4d93f 100644 --- a/tutorial/generateds_tutorial.txt +++ b/tutorial/generateds_tutorial.txt @@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial .. version -:revision: 2.19c +:revision: 2.20a .. version diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip index 10f4d0348f9a08d52678d11cd29379fe4b21f59c..ea26f8a381ffe394295bbb216537f991ddfcfd55 100644 Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ