diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c4b593..4f1834f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,8 +35,8 @@ jobs: pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython pip install codeallybasic==1.1.0 pip install codeallyadvanced==1.1.0 - pip install pyutmodelv2==2.1.0 - pip install ogl==2.1.5 + pip install pyutmodelv2>=2.1.5 + pip install ogl>=2.1.17 pip install untangle==1.2.1 pip install buildlackey==1.6.3 - run: diff --git a/pyproject.toml b/pyproject.toml index 24b8fde..6e00377 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,8 +16,8 @@ dependencies = [ 'untangle==1.2.1', 'codeallybasic>=1.1.0', 'codeallyadvanced>=1.1.0', - 'pyutmodelv2==2.1.0', - 'ogl>=2.1.5', + 'pyutmodelv2>=2.1.5', + 'ogl>=2.1.17', ] [project.urls] diff --git a/requirements.txt b/requirements.txt index 2ddbaa0..1cff186 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ buildlackey==1.6.3 mypy==1.8.0 mypy-extensions==1.0.0 types-Deprecated==1.2.9.20240106 -types-setuptools==69.0.0.20240115 +types-setuptools==69.0.0.20240125 typing_extensions==4.9.0 Deprecated~=1.2.14 @@ -20,5 +20,5 @@ wxPython==4.2.1 codeallybasic==1.1.0 codeallyadvanced==1.1.0 -pyutmodelv2==2.1.0 -ogl==2.1.5 +pyutmodelv2>=2.1.5 +ogl>=2.1.17 diff --git a/src/untanglepyut/UnTanglePyut.py b/src/untanglepyut/UnTanglePyut.py index 06d0230..0d1939b 100644 --- a/src/untanglepyut/UnTanglePyut.py +++ b/src/untanglepyut/UnTanglePyut.py @@ -210,7 +210,6 @@ def noteToPyutNote(self, graphicNote: Element) -> PyutNote: # fix line feeds pyutNote = cast(PyutNote, self._addPyutObjectAttributes(pyutElement=noteElement, pyutObject=pyutNote)) - # TODO: Update when code-ally-basic has common code rawContent: str = noteElement['content'] cleanContent: str = rawContent.replace(XML_END_OF_LINE_MARKER, osLineSep) pyutNote.content = cleanContent diff --git a/src/untanglepyut/_version.py b/src/untanglepyut/_version.py index dd6e3ad..eba3d51 100644 --- a/src/untanglepyut/_version.py +++ b/src/untanglepyut/_version.py @@ -1 +1 @@ -__version__: str = '2.1.5' +__version__: str = '2.1.6'