diff --git a/.circleci/config.yml b/.circleci/config.yml index 85789b8..3b1a942 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,9 +33,9 @@ jobs: pip install html-testRunner~=1.2.1 pip install attrdict3 pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython - pip install pyutmodel~=1.3.4 - pip install ogl~=0.60.41 - pip install untanglepyut==0.6.10 + pip install pyutmodel~=1.4.0 + pip install ogl~=0.70.0 + pip install untanglepyut==0.6.20 - run: name: run tests command: | diff --git a/oglio/toXmlV10/OglSequenceToDom.py b/oglio/toXmlV10/OglSequenceToDom.py index 7ad57a4..bb4600e 100644 --- a/oglio/toXmlV10/OglSequenceToDom.py +++ b/oglio/toXmlV10/OglSequenceToDom.py @@ -73,7 +73,7 @@ def _oglSDMessageToDom(self, oglSDMessage: OglSDMessage, xmlDoc: Document) -> El """ root = self._xmlDocument.createElement(XmlConstants.ELEMENT_GRAPHIC_SD_MESSAGE) - pyutSDMessage: PyutSDMessage = oglSDMessage.getPyutObject() + pyutSDMessage: PyutSDMessage = oglSDMessage.pyutSDMessage root.appendChild(self._pyutToMiniDom.pyutSDMessageToDom(pyutSDMessage, xmlDoc)) return root diff --git a/oglio/toXmlV10/PyutToDom.py b/oglio/toXmlV10/PyutToDom.py index 307f606..e8ea09b 100644 --- a/oglio/toXmlV10/PyutToDom.py +++ b/oglio/toXmlV10/PyutToDom.py @@ -235,7 +235,7 @@ def pyutSDMessageToDom(self, pyutSDMessage: PyutSDMessage, xmlDoc: Document) -> root.setAttribute(XmlConstants.ATTR_ID, str(eltId)) # message - root.setAttribute(XmlConstants.ATTR_MESSAGE, pyutSDMessage.getMessage()) + root.setAttribute(XmlConstants.ATTR_MESSAGE, pyutSDMessage.message) # time srcInstance: PyutSDInstance = pyutSDMessage.getSource() @@ -244,8 +244,8 @@ def pyutSDMessageToDom(self, pyutSDMessage: PyutSDMessage, xmlDoc: Document) -> idSrc: int = self._idFactory.getID(srcInstance) idDst: int = self._idFactory.getID(dstInstance) - root.setAttribute(XmlConstants.ATTR_SOURCE_TIME_LINE, str(pyutSDMessage.getSrcTime())) - root.setAttribute(XmlConstants.ATTR_DESTINATION_TIME_LINE, str(pyutSDMessage.getDstTime())) + root.setAttribute(XmlConstants.ATTR_SOURCE_TIME_LINE, str(pyutSDMessage.sourceY)) + root.setAttribute(XmlConstants.ATTR_DESTINATION_TIME_LINE, str(pyutSDMessage.destinationY)) root.setAttribute(XmlConstants.ATTR_SD_MESSAGE_SOURCE_ID, str(idSrc)) root.setAttribute(XmlConstants.ATTR_SD_MESSAGE_DESTINATION_ID, str(idDst)) diff --git a/requirements.txt b/requirements.txt index 4d886f1..6104202 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,17 @@ wheel==0.38.4 -setuptools==67.0.0 +setuptools==67.2.0 twine==4.0.2 build==0.10.0 html-testRunner~=1.2.1 -mypy==0.991 +# mypy==0.991 +mypy==1.0.0 mypy-extensions~= 0.4.3 typing_extensions==4.4.0 -types-setuptools==65.7.0.3 +types-setuptools==67.2.0.1 wxpython~=4.2.0 -pyutmodel==1.3.4 -ogl==0.60.41 -untanglepyut==0.6.10 \ No newline at end of file +pyutmodel==1.4.0 +ogl==0.70.0 +untanglepyut==0.6.20 \ No newline at end of file diff --git a/setup.py b/setup.py index f85dfc9..b8889ec 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="oglio", - version="0.5.51", + version="0.5.60", author_email='Humberto.A.Sanchez.II@gmail.com', maintainer='Humberto A. Sanchez II', maintainer_email='humberto.a.sanchez.ii@gmail.com', @@ -27,8 +27,8 @@ }, install_requires=[ 'wxPython==4.2.0', - 'pyutmodel~=1.3.4', - 'ogl~=0.60.41', - 'untanglepyut~=0.6.10', + 'pyutmodel~=1.4.0', + 'ogl~=0.70.0', + 'untanglepyut~=0.6.20', ], )