From 9a4d0e6a57a595f277969189bc4f6b1081d2d9a9 Mon Sep 17 00:00:00 2001 From: Humberto Sanchez II Date: Sun, 10 Mar 2024 10:27:48 -0500 Subject: [PATCH] <>[]: [ * Rationalize dependencies * Update with comments from the woke Grazie plugin ] [] --- .circleci/config.yml | 4 ++-- pyproject.toml | 4 ++-- requirements.txt | 16 ++++++++-------- src/ogl/OglClass.py | 6 +++--- src/ogl/_version.py | 2 +- src/ogl/events/OglEvents.py | 2 +- .../ui/valuecontrols/ClassAttributesControl.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a28d52d..5378b4a 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/pyproject.toml b/pyproject.toml index ea94cca..acd35f7 100644 --- a/pyproject.toml +++ b/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', ] diff --git a/requirements.txt b/requirements.txt index 6978bde..2cf2ccb 100644 --- a/requirements.txt +++ b/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 diff --git a/src/ogl/OglClass.py b/src/ogl/OglClass.py index 6c4ea2a..793a65d 100644 --- a/src/ogl/OglClass.py +++ b/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 diff --git a/src/ogl/_version.py b/src/ogl/_version.py index 96f8622..e978fcc 100644 --- a/src/ogl/_version.py +++ b/src/ogl/_version.py @@ -1 +1 @@ -__version__ = '2.1.17' +__version__ = '2.1.20' diff --git a/src/ogl/events/OglEvents.py b/src/ogl/events/OglEvents.py index 70e96d1..1431bdf 100644 --- a/src/ogl/events/OglEvents.py +++ b/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() diff --git a/src/ogl/ui/valuecontrols/ClassAttributesControl.py b/src/ogl/ui/valuecontrols/ClassAttributesControl.py index 333ba3a..06f45a2 100644 --- a/src/ogl/ui/valuecontrols/ClassAttributesControl.py +++ b/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)