<API update>[Ogl]: <Bump dependencies>

[Ogl and the py-orthogonal-routing]

[#116]

.circleci/config.yml

@@ -37,15 +37,15 @@ jobs:
             pip install networkx==3.0
             pip install orthogonal==1.2.0
             pip install pyumldiagrams==3.1.10
-            pip install codeallybasic==1.3.1
+            pip install codeallybasic==1.3.2
             pip install codeallyadvanced==1.3.1
             pip install pyutmodelv2==2.1.5
-            pip install ogl>=2.1.33
-            pip install untanglepyut==2.2.0
-            pip install oglio==2.2.0
+            pip install ogl>=3.0.0
+            pip install untanglepyut==2.3.0
+            pip install oglio==2.3.0
             pip install buildlackey~=1.6.3
             pip install pyforcedirectedlayout>=0.80.2
-            pip install pyorthogonalrouting>=1.2.0
+            pip install pyorthogonalrouting>=1.2.1
       - run:
             name: run tests
             command: | 

pyproject.toml

@@ -25,7 +25,7 @@ dependencies = [
   'networkx==3.0',
   'orthogonal==1.2.0',
   'pyforcedirectedlayout>=0.80.2',
-  'pyorthogonalrouting>=1.2.0',
+  'pyorthogonalrouting>=1.2.1',
 ]
 [project.urls]
 Repository = 'https://github.com/hasii2011/pyutplugins'

requirements.txt

@@ -1,14 +1,13 @@
-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
 
-mypy==1.9.0
+mypy==1.10.1
 mypy-extensions==1.0.0
-types-Deprecated==1.2.9.20240311
-types-setuptools==69.1.0.20240310
-typing_extensions==4.10.0
+types-setuptools==70.1.0.20240627
+typing_extensions==4.12.2
 
 # For IOPython
 antlr4-python3-runtime==4.13.1
@@ -18,10 +17,10 @@ click==8.1.7
 
 wxPython==4.2.1
 
-codeallybasic==1.3.1
+codeallybasic==1.3.2
 codeallyadvanced==1.3.1
 
-pyutmodelv2==2.1.5
+pyutmodelv2==2.1.6
 ogl>=3.0.0
 untanglepyut==2.3.0
 oglio==2.3.0
@@ -33,4 +32,4 @@ networkx==3.0
 orthogonal==1.2.0
 pyumldiagrams==3.1.15
 pyforcedirectedlayout>=0.80.2
-pyorthogonalrouting>=1.2.0
+pyorthogonalrouting==1.2.1

tests/scaffoldv2/ScaffoldUI.py

@@ -240,7 +240,7 @@ def _selectShapes(self, selected: bool):
             selected: 'True' selects them all, 'False' deselects them
         """
 
-        shapes = self._currentFrame.diagram.GetShapes()
+        shapes = self._currentFrame.diagram.shapes
         for shape in shapes:
             shape.selected = selected
 

tests/scaffoldv2/umlframes/FrameHandler.py

@@ -6,10 +6,11 @@
 
 from copy import deepcopy
 
+from miniogl.models.ShapeModel import ShapeModel
+
 from miniogl.AnchorPoint import AnchorPoint
 from miniogl.ControlPoint import ControlPoint
 from miniogl.LineShape import ControlPoints
-from miniogl.ShapeModel import ShapeModel
 
 from ogl.OglAssociation import OglAssociation
 from ogl.OglClass import OglClass

tests/scaffoldv2/umlframes/UmlFrame.py

@@ -81,7 +81,7 @@ def umlObjects(self) -> UmlObjects:
         """
         umlObjects: UmlObjects = UmlObjects([])
 
-        for s in self._diagram.GetShapes():
+        for s in self._diagram.shapes:
             # This is a duplicate of the UmlObject, since I cannot use NewType
             if isinstance(s, (OglClass, OglLink, OglNote, OglText, OglSDMessage, OglSDInstance, OglActor, OglUseCase, OglInterface2)):
                 umlObjects.append(s)
@@ -101,7 +101,7 @@ def objectBoundaries(self) -> OglObjectBoundaries:
         maxY: int = -maxsize
 
         # Get boundaries
-        for shapeObject in self._diagram.GetShapes():
+        for shapeObject in self._diagram.shapes:
             # Get object limits
             ox1, oy1 = shapeObject.GetPosition()
             ox2, oy2 = shapeObject.GetSize()