From c1a331f0287e85b010653955ecf9557cdc3a1858 Mon Sep 17 00:00:00 2001 From: Humberto Sanchez II Date: Wed, 17 Jan 2024 14:30:47 -0600 Subject: [PATCH] <>[]: [Loosen up versions] [https://github.com/hasii2011/oglio/issues/55] --- .circleci/config.yml | 8 ++++---- pyproject.toml | 8 ++++---- requirements.txt | 8 ++++---- src/oglio/IDFactory.py | 2 +- src/oglio/_version.py | 2 +- tests/ProjectTestBase.py | 2 -- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70317b9..a9648ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,11 +33,11 @@ jobs: pip install html-testRunner~=1.2.1 pip install attrdict3~=2.0.2 pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython - pip install codeallybasic==1.0.0 - pip install codeallyadvanced==1.0.0 + pip install codeallybasic==1.1.0 + pip install codeallyadvanced==1.1.0 pip install pyutmodelv2~=2.1.0 - pip install ogl~=2.1.0 - pip install untanglepyut==2.1.0 + pip install ogl~=2.1.5 + pip install untanglepyut==2.1.5 pip install buildlackey~=1.6.3 - run: name: run tests diff --git a/pyproject.toml b/pyproject.toml index 460b0ce..d15e4ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,11 +14,11 @@ keywords = ['pyut', 'python', 'xml'] dependencies = [ 'wxPython==4.2.1', - 'codeallybasic==1.0.0', - 'codeallyadvanced==1.0.0', + 'codeallybasic>=1.1.0', + 'codeallyadvanced>=1.1.0', 'pyutmodelv2==2.1.0', - 'ogl==2.1.0', - 'untanglepyut==2.1.0', + 'ogl>=2.1.5', + 'untanglepyut>=2.1.5', ] [project.urls] diff --git a/requirements.txt b/requirements.txt index fa01f4b..cff5405 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,8 +12,8 @@ types-setuptools==69.0.0.20240115 wxPython~=4.2.1 -codeallybasic==1.0.0 -codeallyadvanced==1.0.0 +codeallybasic==1.1.0 +codeallyadvanced==1.1.0 pyutmodelv2==2.1.0 -ogl==2.1.0 -untanglepyut==2.1.0 \ No newline at end of file +ogl==2.1.5 +untanglepyut==2.1.5 \ No newline at end of file diff --git a/src/oglio/IDFactory.py b/src/oglio/IDFactory.py index aea8b31..430b346 100644 --- a/src/oglio/IDFactory.py +++ b/src/oglio/IDFactory.py @@ -13,7 +13,7 @@ class IDFactory(Singleton): A user-defined class or class object is an instance of the object named `type`, which is itself a `class`. Classes are created from `type`, or in other words: - > A class is an instance of the class `type`. In Python 3 there is no difference between `classes` and `types` + A class is an instance of the class `type`. In Python 3, there is no difference between `classes` and `types`. """ nextID: int = 1 diff --git a/src/oglio/_version.py b/src/oglio/_version.py index dd8a1a7..dd6e3ad 100644 --- a/src/oglio/_version.py +++ b/src/oglio/_version.py @@ -1 +1 @@ -__version__: str = '2.1.0' +__version__: str = '2.1.5' diff --git a/tests/ProjectTestBase.py b/tests/ProjectTestBase.py index b6a2d0b..632e9cc 100644 --- a/tests/ProjectTestBase.py +++ b/tests/ProjectTestBase.py @@ -9,8 +9,6 @@ from pyutmodelv2.PyutObject import PyutObject from pyutmodelv2.PyutObject import infiniteSequence -from oglio.toXmlV10.BaseToDom import IDFactory - class ProjectTestBase(UnitTestBaseW):