Updating the python xml processing package

Author: cssherman

pygeos/__init__.py pygeos_package/pygeos/__init__.pypygeos/__init__.py renamed to pygeos_package/pygeos/__init__.py

@@ -6,7 +6,6 @@
 from .unit_manager import unitManager 
 from .xml_processor import preprocessGEOSXML
 from .table_generator import writeGEOSTable, readGEOSTable
-from .format_xml import format_xml_file
 from .test_manager import runUnitTests
-
+from .format_xml import format_xml_file
 

pygeos/example/compile_xml pygeos_package/pygeos/example/compile_xmlpygeos/example/compile_xml renamed to pygeos_package/pygeos/example/compile_xml

@@ -4,25 +4,22 @@
 
 def format_xml_file(input_file, output_file=''):
 
-  # This should be updated when possible
   active_blocks = ['Solvers',
-                   'SolverApplications',
+                   'Outputs',
+                   'Events',
                    'Mesh',
-                   'ElementRegions',
-                   'Contact',
                    'Partition',
-                   'Output',
+                   'NumericalMethods',
+                   'ElementRegions',
+                   'Constitutive',
                    'InitialConditions',
-                   'InitialConstitutiveValues',
-                   'BoundaryConditions',
-                   'Tables',
-                   'Fracture',
-                   'Facesets',
-                   'Nodesets']
+                   'FieldSpecifications',
+                   'Functions',
+                   'Geometry',
+                   'Fracture']
 
   documentation_blocks = ['Included',
-                          'Parameters',
-                          'DFNSets']
+                          'Parameters']
 
 
   # Open new files

pygeos/format_xml.py pygeos_package/pygeos/format_xml.pypygeos/format_xml.py renamed to pygeos_package/pygeos/format_xml.py

@@ -1,5 +1,6 @@
 import re
 
+
 class RegexConfig():
   def __init__(self):
     self.parameters = r"\$:?([a-zA-Z_]*)\$?"

pygeos/regex_config.py pygeos_package/pygeos/regex_config.pypygeos/regex_config.py renamed to pygeos_package/pygeos/regex_config.py

@@ -230,19 +230,14 @@ def diff_xml(self, source, target):
 
   def test_basic_xml(self):
     tmp = preprocessGEOSXML(self.modPath + '/tests/source_xml/basic.xml', verbose=0)
-    self.diff_xml(tmp, self.modPath + '/tests/target_xml/raw_basic.xml')
+    self.diff_xml(tmp, self.modPath + '/tests/target_xml/target_basic.xml')
 
   def test_includes_xml(self):
     tmp = preprocessGEOSXML(self.modPath + '/tests/source_xml/includes.xml', verbose=0)
-    self.diff_xml(tmp, self.modPath + '/tests/target_xml/raw_includes.xml')
+    self.diff_xml(tmp, self.modPath + '/tests/target_xml/target_includes.xml')
 
   def test_symbolic_xml(self):
     tmp = preprocessGEOSXML(self.modPath + '/tests/source_xml/symbolic.xml', verbose=0)
-    self.diff_xml(tmp, self.modPath + '/tests/target_xml/raw_symbolic.xml')
-
-  def test_formatting_xml(self):
-    tmp = preprocessGEOSXML(self.modPath + '/tests/source_xml/symbolic.xml', verbose=0)
-    format_xml_file(tmp)
     self.diff_xml(tmp, self.modPath + '/tests/target_xml/target_symbolic.xml')