<>[]: <Dependency Update>

[
* Rationalize dependencies
* Update with comments from the woke Grazie plugin
]

[]

.circleci/config.yml

@@ -35,8 +35,8 @@ jobs:
  pip install attrdict3
  pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython
  pip install Deprecated~=1.2.14
- pip install codeallybasic==1.1.0
- pip install codeallyadvanced==1.1.0
+ pip install codeallybasic==1.3.0
+ pip install codeallyadvanced==1.3.1
  pip install pyutmodelv2==2.1.5
  - run:
  name: run tests

pyproject.toml

@@ -14,8 +14,8 @@ keywords = ['pyut', 'graphical shapes', 'python',]
 
 dependencies = [
  'wxPython~=4.2.1',
- 'codeallybasic>=1.1.0',
- 'codeallyadvanced>=1.1.0',
+ 'codeallybasic>=1.3.0',
+ 'codeallyadvanced>=1.3.1',
  'pyutmodelv2>=2.1.5',
 ]
 

requirements.txt

@@ -1,21 +1,21 @@
 wheel==0.42.0
-setuptools==69.0.3
-twine==4.0.2
-build==1.0.3
+setuptools==69.1.1
+twine==5.0.0
+build==1.1.1
 html-testRunner~=1.2.1
 pkgversions==0.2.2
 # For CirlceCI
 buildlackey==1.6.3
 
-mypy==1.8.0
+mypy==1.9.0
 mypy-extensions==1.0.0
 types-Deprecated==1.2.9.20240106
-types-setuptools==69.0.0.20240125
-typing_extensions==4.9.0
+types-setuptools==69.1.0.20240310
+typing_extensions==4.10.0
 Deprecated==1.2.14
 
 pyutmodelv2==2.1.5
-codeallybasic==1.1.0
-codeallyadvanced==1.1.0
+codeallybasic==1.3.0
+codeallyadvanced==1.3.1
 
 wxPython~=4.2.1

src/ogl/OglClass.py

@@ -45,7 +45,7 @@
 
 MARGIN: int = 10
 #
-# When I added optional display of constructor and/or dunder methods, I introduced this bug
+# When I added optional display of constructor and dunder methods, I introduced this bug
 # I'll fix this later
 #
 HACK_FIX_AUTO_RESIZE: bool = True # TODO: This should be a debug flag
@@ -64,7 +64,7 @@ class OglClass(OglObject):
  You instantiate an OGL class and add it to the diagram.
  Links, resizing, are managed by parent class `OglObject`.
 
- For more instructions about how to create an OGL object, please refer
+ For more instructions about how to create an OGL object, refer
  to the `OglObject` class.
  """
  def __init__(self, pyutClass: PyutClass | None, w: int = 0, h: int = 0):
@@ -291,7 +291,7 @@ def _drawClassHeader(self, dc: DC, draw: bool = False, initialX=None, initialY=N
  # Init
  dc.SetFont(self._defaultFont)
  dc.SetTextForeground(self._textColor)
- # pyutObject = self.getPyutObject()
+
  x, y = self.GetPosition()
  if initialX is not None:
  x = initialX

src/ogl/_version.py

@@ -1 +1 @@
-__version__ = '2.1.17'
+__version__ = '2.1.20'

src/ogl/events/OglEvents.py

@@ -4,7 +4,7 @@
 from wx.lib.newevent import NewEvent
 
 #
-# Constructor returns a tuple; First is the event, The second is the binder
+# The constructor returns a tuple; The first entry is the event, The second is the binder
 #
 ShapeSelectedEvent, EVT_SHAPE_SELECTED = NewEvent()
 CutOglClassEvent, EVT_CUT_OGL_CLASS = NewEvent()

src/ogl/ui/valuecontrols/ClassAttributesControl.py

@@ -123,7 +123,7 @@ def _setControlValues(self):
  """
  self._classDimensions.dimensions = self._preferences.classDimensions
 
- oglColors: List[str] = self._classBackgroundColor.GetItems()
+ oglColors:  List[str] = self._classBackgroundColor.GetItems()
  bgColorSelIdx: int = oglColors.index(self._preferences.classBackgroundColor.value)
  self._classBackgroundColor.SetSelection(bgColorSelIdx)