diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..a7cba45 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,3 @@ +[run] +omit = + tests/* diff --git a/.gitignore b/.gitignore index 8c150ef..d4532d4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ share/python-wheels/ .installed.cfg *.egg MANIFEST -.venv \ No newline at end of file +.venv +.coverage diff --git a/requirements.txt b/requirements.txt index 5daae26..5281e36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -pydantic>=2.0.0 +pydantic>=2.7.4 jsonschema==4.17.1 setuptools~=65.5.1 diff --git a/setup.py b/setup.py index ca258d1..512ba0b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( install_requires=[ - "pydantic>=2.0.0", + "pydantic>=2.7.4", "jsonschema==4.17.1", "setuptools~=65.5.1", ], diff --git a/src/marqo_commons/model_registry/model_properties_object.py b/src/marqo_commons/model_registry/model_properties_object.py index 6e1dc8c..5d6fff4 100644 --- a/src/marqo_commons/model_registry/model_properties_object.py +++ b/src/marqo_commons/model_registry/model_properties_object.py @@ -52,7 +52,7 @@ def _get_default_model_size(cls, name) -> float: for name, size in constants.MODEL_NAME_SIZE_MAPPING.items(): if name in name_info: return size - return cls.__fields__["default_memory_size"].default + return cls.model_fields["default_memory_size"].default def to_dict(self): """Function returns a dict of the model properties without the default values. diff --git a/tox.ini b/tox.ini index aaca281..14b5722 100644 --- a/tox.ini +++ b/tox.ini @@ -5,16 +5,22 @@ envlist = py38 whitelist_externals = python deps = + coverage pytest commands = - pytest {posargs} + coverage run --source={toxinidir} -m pytest -W error {posargs} + coverage html + coverage report --fail-under=95 + [testenv:gh-workflows] basepython = {env:TOXPYTHON:python3.8} deps = pytest + coverage -r{toxinidir}/requirements.txt setenv = PYTHONPATH={toxinidir} commands = - pytest {posargs} + coverage run --source={toxinidir} -m pytest -W error {posargs} + coverage report --fail-under=95