<>[]: <Bump Dependencies>

[
* Bump PyutModel and Ogl
* Type on XML
* Use new buildlackey unit test discovery
* Use non pyproject.toml version of buildlackey
]

[]

Author: Humberto Sanchez II

.circleci/config.yml

@@ -35,10 +35,10 @@ jobs:
             pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04  wxPython
             pip install codeallybasic==0.5.2
             pip install codeallyadvanced==0.5.2
-            pip install ogl==0.90.3
+            pip install ogl==1.0.0
             pip install untangle==1.2.1
             pip install buildlackey==1.3.3
       - run:
             name: run tests
             command: | 
-              runtests
+              unittests -s .

requirements.txt

@@ -1,15 +1,15 @@
-wheel==0.41.2
-setuptools==68.2.2
+wheel==0.41.3
+setuptools==69.0.2
 twine==4.0.2
 build==1.0.3
 html-testRunner~=1.2.1
 
-buildlackey==1.3.3
+buildlackey==1.6.0
 
-mypy==1.5.1
+mypy==1.7.1
 mypy-extensions==1.0.0
 types-Deprecated==1.2.9.3
-types-setuptools==68.2.0.0
+types-setuptools==68.2.0.2
 typing_extensions==4.8.0
 
 Deprecated~=1.2.14
@@ -20,5 +20,5 @@ wxPython==4.2.1
 codeallybasic==0.5.2
 codeallyadvanced==0.5.2
 
-pyutmodel==1.5.0
-ogl==0.90.3
+pyutmodel==1.5.1
+ogl==1.0.0

setup.py

@@ -24,5 +24,5 @@
         'untanglepyut': ['py.typed'],
     },
 
-    install_requires=['codeallybasic==0.5.2', 'codeallyadvanced==0.5.2', 'pyutmodel==1.5.0', 'ogl==0.90.3', 'untangle==1.2.1'],
+    install_requires=['codeallybasic==0.5.2', 'codeallyadvanced==0.5.2', 'pyutmodel==1.5.1', 'ogl==1.0.0', 'untangle==1.2.1'],
 )

tests/TestAll.py

@@ -79,7 +79,7 @@
 
 V11_SOURCE_PYUT_CLASS: str = """
     <OglClass width="78" height="44" x="150" y="150">
-        <PyutClass id="1" name="Folder" stereotype="noStereotype" displayMethods="True" displayParameters="Unspecified" displayFields="True" displayStereotype="True" description="", fileName="">
+        <PyutClass id="1" name="Folder" stereotype="noStereotype" displayMethods="True" displayParameters="Unspecified" displayFields="True" displayStereotype="True" description="" fileName="">
             <PyutField name="permissions" visibility="PRIVATE" type="" defaultValue="" />
         </PyutClass>
     </OglClass>
@@ -166,7 +166,7 @@ def setUpClass(cls):
 
     def setUp(self):
         super().setUp()
-        
+
     def tearDown(self):
         super().tearDown()
 
@@ -198,8 +198,8 @@ def testPyutClass(self):
         self._checkFields(pyutClass=pyutClass)
 
     def testPyutLinks(self):
-        sourcePyutClass:      PyutClass = self._getPyutClass(rawXml=V11_SOURCE_PYUT_CLASS)
         destinationPyutClass: PyutClass = self._getPyutClass(rawXml=V11_DESTINATION_PYUT_CLASS)
+        sourcePyutClass:      PyutClass = self._getPyutClass(rawXml=V11_SOURCE_PYUT_CLASS)
 
         rootElement:     Element = parse(V11_PYUT_LINK)
         pyutLinkElement: Element = rootElement.PyutLink
@@ -326,8 +326,8 @@ def _getPyutClass(self, rawXml: str) -> PyutClass:
         root:           Element = parse(rawXml)
         oglSourceClass: Element = root.OglClass
 
-        untanglepyut:     UnTanglePyut = UnTanglePyut(xmlVersion=XmlVersion.V11)
-        pyutClass:  PyutClass = untanglepyut.classToPyutClass(graphicClass=oglSourceClass)
+        untanglepyut: UnTanglePyut = UnTanglePyut(xmlVersion=XmlVersion.V11)
+        pyutClass:    PyutClass    = untanglepyut.classToPyutClass(graphicClass=oglSourceClass)
 
         self.logger.debug(f'{pyutClass}')
 

tests/untanglepyut/v11/TestUnTanglePyut.py

@@ -195,6 +195,7 @@ def noteToPyutNote(self, graphicNote: Element) -> PyutNote:
         # fix line feeds
         pyutNote = cast(PyutNote, self._addPyutObjectAttributes(pyutElement=noteElement, pyutObject=pyutNote))
 
+        # TODO:  Update when code-ally-basic has common code
         rawContent:   str = noteElement['content']
         cleanContent: str = rawContent.replace(UnTanglePyut.END_OF_LINE_MARKER, osLineSep)
         pyutNote.content = cleanContent

untanglepyut/UnTanglePyut.py

@@ -1 +1 @@
-__version__: str = '1.3.1'
+__version__: str = '1.3.2'