diff --git a/.circleci/config.yml b/.circleci/config.yml index 12b2a24..5c363fc 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 codeallybasic==1.3.0 - pip install codeallyadvanced==1.3.1 - pip install pyutmodelv2>=2.1.5 + pip install codeallybasic>=1.3.2 + pip install codeallyadvanced>=1.3.1 + pip install pyutmodelv2>=2.1.6 pip install ogl>=3.0.0 pip install untangle==1.2.1 pip install buildlackey==1.6.3 diff --git a/pyproject.toml b/pyproject.toml index 29261c9..b2aad05 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,9 +14,9 @@ keywords = ['pyut', 'graphical shapes', 'python', 'xml'] dependencies = [ 'untangle==1.2.1', - 'codeallybasic>=1.3.0', + 'codeallybasic>=1.3.2', 'codeallyadvanced>=1.3.1', - 'pyutmodelv2>=2.1.5', + 'pyutmodelv2>=2.1.6', 'ogl>=3.0.0', ] diff --git a/requirements.txt b/requirements.txt index 08b8d0a..3e520ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,20 @@ -wheel==0.42.0 -setuptools==69.1.1 -twine==5.0.0 -build==1.1.1 +wheel==0.43.0 +setuptools==70.2.0 +twine==5.1.1 +build==1.2.1 html-testRunner~=1.2.1 buildlackey==1.6.3 -mypy==1.9.0 +mypy==1.10.1 mypy-extensions==1.0.0 -types-Deprecated==1.2.9.20240106 -types-setuptools==69.1.0.20240310 -typing_extensions==4.10.0 - -Deprecated~=1.2.14 +typing_extensions==4.12.2 untangle==1.2.1 wxPython==4.2.1 -codeallybasic==1.3.0 -codeallyadvanced==1.3.1 +codeallybasic>=1.3.2 +codeallyadvanced>=1.3.1 -pyutmodelv2>=2.1.5 +pyutmodelv2==2.1.6 ogl>=3.0.0 diff --git a/src/untanglepyut/BaseUnTangle.py b/src/untanglepyut/BaseUnTangle.py index 0f05c7a..2aa25c0 100644 --- a/src/untanglepyut/BaseUnTangle.py +++ b/src/untanglepyut/BaseUnTangle.py @@ -2,7 +2,7 @@ from logging import Logger from logging import getLogger -from miniogl.ShapeModel import ShapeModel +from miniogl.models.ShapeModel import ShapeModel from ogl.OglObject import OglObject diff --git a/src/untanglepyut/UnTangleOglLinks.py b/src/untanglepyut/UnTangleOglLinks.py index 0b20897..aec127b 100644 --- a/src/untanglepyut/UnTangleOglLinks.py +++ b/src/untanglepyut/UnTangleOglLinks.py @@ -156,7 +156,7 @@ def _graphicLinkToOglLink(self, graphicLink: Element, linkableOglObjects: Linkab dstModel.SetPosition(x=gla.dstX, y=gla.dstY) # add the control points to the line - line = srcAnchor.GetLines()[0] # only 1 line per anchor in Pyut + line = srcAnchor.lines[0] # only 1 line per anchor in Pyut parent = line.sourceAnchor.parent selfLink: bool = parent is oglLink.destinationAnchor.parent