diff --git a/MANIFEST.in b/MANIFEST.in index 475b8d27369b2a70f0176353210685eb62ef3e7d..27da3a9b13fce00d24e2504693c9297bf8f852b6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ include README LICENSE MANIFEST.in include setup.py include generateDS.py +include generateds_config.py include generateDS.txt include django/gends_run_gen_django.py include django/gends_extract_simple_types.py @@ -77,14 +78,24 @@ include tests/people_procincl_b.xsd include tests/abstract_type.xsd include tests/abstract_type1_sup.py tests/abstract_type1_sub.py include tests/abstract_type2_sup.py tests/abstract_type2_sub.py - include tests/simpletypes_other.xsd -include tests/simpletypes_other1_sup.py tests/simpletypes1_other_sub.py -include tests/simpletypes_other2_sup.py tests/simpletypes_other2_sub.py - +include tests/simpletypes_other1_sub.py tests/simpletypes1_other_sup.py +include tests/simpletypes_other2_sub.py tests/simpletypes_other2_sup.py include tests/attr_groups.xsd include tests/attr_groups1_sup.py tests/attr_groups1_sub.py include tests/attr_groups2_sup.py tests/attr_groups2_sub.py +include tests/oneper00.xsd tests/oneper01.xsd tests/oneper02.xsd +include tests/OnePer/oneperType0?_?One.py +include tests/anonymous_type.xsd +include tests/anonymous_type1_sub.py tests/anonymous_type1_sup.py +include tests/anonymous_type2_sub.py tests/anonymous_type2_sup.py +include tests/catalog.xml tests/catalogtest.xsd +include tests/catalogtest1_sub.py tests/catalogtest1_sup.py +include tests/catalogtest2_sub.py tests/catalogtest2_sup.py +include tests/to_etree.xsd tests/to_etree.xml +include tests/to_etree1.xml tests/to_etree2.xml +include tests/to_etree1_sub.py tests/to_etree1_sup.py +include tests/to_etree2_sub.py tests/to_etree2_sup.py include gui/generateds_gui.py include gui/generateds_gui.glade diff --git a/README b/README index 2890b49d0f0045e96df2a86242b7a32804c37207..59de3a66d4c732d9b4414961389276694df12b02 100644 --- a/README +++ b/README @@ -148,12 +148,15 @@ Version 2.12b (02/10/2014) documentation for more on this. Thanks to Mikki Weesenaar for bring up the use case that needed this. - Additional fixes for the "one module per XSD file". Also, - creation of a unit test for this capability. Thanks again to + creation of a unit test for this capability. See section "One + Per -- generating separate files from imported/included schemas" + in the documentation for more information. Thanks again to George David for all his work on this. - Fixes to process_includes.py -- Some uses of namespace prefix xs: were hard-coded, whereas some XML schemas use xsd: instead of xs:. - Various fixes to unit tests so that all unit tests pass when using - the cloned Mercurial repository. + either the cloned Mercurial repository at Bitbucket + (https://bitbucket.org/dkuhlman/generateds) or the tar achive. Version 2.12a (10/29/2013) - A name conflict issue caused by naming anonymous types. An diff --git a/generateDS.html b/generateDS.html index 7776b70cbe8d2095e039809fe7de6dee1ea7037e..1dee987d4f389a66ce8026a27032e109cfa6352d 100644 --- a/generateDS.html +++ b/generateDS.html @@ -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.12a</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.12b</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 07, 2014</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">February 10, 2014</td> </tr> </tbody> </table> @@ -2494,7 +2494,7 @@ generate a separate Python module for each XML schema that is imported or included (using <tt class="docutils literal"><xs:import></tt> or <tt class="docutils literal"><xs:include></tt>) by a "master" schema. Then, in your Python application, these modules can then be imported separately. Alternatively, these modules can -be placed in a Python package (a directory containing a file name +be placed in a Python package (a directory containing a file named "__init__.py"). See <a class="reference external" href="http://docs.python.org/2/tutorial/modules.html#packages">http://docs.python.org/2/tutorial/modules.html#packages</a> for more on Python packages.</p> @@ -2865,7 +2865,7 @@ following among others:</p> <div class="footer"> <hr class="footer" /> <a class="reference external" href="generateDS.txt">View document source</a>. -Generated on: 2014-02-07 17:27 UTC. +Generated on: 2014-02-10 22:19 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.html b/librarytemplate_howto.html index de459c9d90b6df81035a98f8b8f2a583ef07a99f..90c68872316255c8756f9a67ceac2b4c5fe50fc4 100644 --- a/librarytemplate_howto.html +++ b/librarytemplate_howto.html @@ -187,9 +187,12 @@ div.warning p.admonition-title { font-family: sans-serif } tt.docutils { - background-color: #eeeeee; + background-color: #dddddd; } +ul.auto-toc { + list-style-type: none } + </style> </head> <body> @@ -214,7 +217,7 @@ tt.docutils { <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.12a</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.12b</td> </tr> </tbody> </table> @@ -223,7 +226,7 @@ tt.docutils { <col class="field-name" /> <col class="field-body" /> <tbody valign="top"> -<tr class="field"><th class="field-name">date:</th><td class="field-body">October 29, 2013</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">February 10, 2014</td> </tr> </tbody> </table> @@ -377,6 +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: 2014-02-10 22:19 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.html b/tutorial/generateds_tutorial.html index 023f480f75094e578b8d40844412e80a81409bd4..6bdd14579fbda62c8788871865f789159bc76ec5 100644 --- a/tutorial/generateds_tutorial.html +++ b/tutorial/generateds_tutorial.html @@ -187,9 +187,12 @@ div.warning p.admonition-title { font-family: sans-serif } tt.docutils { - background-color: #eeeeee; + background-color: #dddddd; } +ul.auto-toc { + list-style-type: none } + </style> </head> <body> @@ -216,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.12a</td> +<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.12b</td> </tr> </tbody> </table> @@ -225,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">October 29, 2013</td> +<tr class="field"><th class="field-name">date:</th><td class="field-body">February 10, 2014</td> </tr> </tbody> </table> @@ -1207,6 +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: 2014-02-10 22:19 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.zip b/tutorial/generateds_tutorial.zip index abd24520b791cac3688286e971c707d5adc181d7..cc32d31d335966a04b4b308df3cafcc208470ab2 100644 Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ