From accb33e2f8a3a645f7ad14b1974edbf142caa4e8 Mon Sep 17 00:00:00 2001 From: Humberto Sanchez II Date: Wed, 22 Feb 2023 15:19:48 -0700 Subject: [PATCH] <>[]: [] [https://github.com/hasii2011/oglio/issues/23] --- .circleci/config.yml | 5 +++-- oglio/toXmlV10/BaseToDom.py | 2 +- requirements.txt | 14 +++++++------- setup.py | 7 ++++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58a0268..bfbaca2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,9 +33,10 @@ jobs: pip install html-testRunner~=1.2.1 pip install attrdict3 pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 wxPython + pip install hasiicommon~=0.0.7 pip install pyutmodel~=1.4.0 - pip install ogl~=0.70.10 - pip install untanglepyut==0.6.30 + pip install ogl~=0.70.20 + pip install untanglepyut==0.6.40 - run: name: run tests command: | diff --git a/oglio/toXmlV10/BaseToDom.py b/oglio/toXmlV10/BaseToDom.py index 8b69fb8..7df243b 100644 --- a/oglio/toXmlV10/BaseToDom.py +++ b/oglio/toXmlV10/BaseToDom.py @@ -3,7 +3,7 @@ from typing import Dict from typing import Union -from ogl.Singleton import Singleton +from hasiicommon.Singleton import Singleton class IDFactory(Singleton): diff --git a/requirements.txt b/requirements.txt index 4beb37c..4e31076 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,17 @@ wheel==0.38.4 -setuptools==67.2.0 +setuptools==67.4.0 twine==4.0.2 build==0.10.0 html-testRunner~=1.2.1 -# mypy==0.991 -mypy==1.0.0 +mypy==1.0.1 mypy-extensions==1.0.0 -typing_extensions==4.4.0 -types-setuptools==67.2.0.1 +typing_extensions==4.5.0 +types-setuptools==67.4.0.1 wxpython~=4.2.0 +hasiicommon~=0.0.7 pyutmodel==1.4.0 -ogl==0.70.10 -untanglepyut==0.6.30 \ No newline at end of file +ogl==0.70.20 +untanglepyut==0.6.40 \ No newline at end of file diff --git a/setup.py b/setup.py index 1439e47..cab3a6a 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="oglio", - version="0.5.70", + version="0.5.80", author_email='Humberto.A.Sanchez.II@gmail.com', maintainer='Humberto A. Sanchez II', maintainer_email='humberto.a.sanchez.ii@gmail.com', @@ -27,8 +27,9 @@ }, install_requires=[ 'wxPython==4.2.0', + 'hasiicommon~=0.0.7', 'pyutmodel~=1.4.0', - 'ogl~=0.70.10', - 'untanglepyut~=0.6.30', + 'ogl~=0.70.20', + 'untanglepyut~=0.6.40', ], )