diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py index 5c2f2ae422a9cdf69ec3957d1d817c8bc0829ce5..fc9b9c698ab3b51345d7d4b411111f2d822a98e5 100644 --- a/dinamis_sdk/__init__.py +++ b/dinamis_sdk/__init__.py @@ -3,7 +3,7 @@ # flake8: noqa import pkg_resources -__version__ = "0.3.6" +__version__ = "0.3.8" from dinamis_sdk.s3 import ( sign, sign_inplace, diff --git a/dinamis_sdk/auth.py b/dinamis_sdk/auth.py index 9e938f1e87a64f6ddbe977408f9fde29c9c95d57..198ea04bea265c62e4dcfc4c23aad430bf44236b 100644 --- a/dinamis_sdk/auth.py +++ b/dinamis_sdk/auth.py @@ -196,7 +196,7 @@ class OAuth2Session: try: if self.jwt: with open(JWT_FILE, "w", encoding="UTF-8") as file: - json.dump(self.jwt.dict(), file) + json.dump(self.jwt.model_dump(), file) log.debug("Token saved in %s", JWT_FILE) except IOError as io_err: log.warning("Unable to save token (%s)", io_err) diff --git a/pyproject.toml b/pyproject.toml index cd4a91753785a6412fbb6c43fb019c3b2b39a145..990cb530074f9e6f29f748600e292a26c2a7a070 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ requires-python = ">=3.7" dependencies = [ "setuptools>=61.2", "click>=7.1", - "pydantic>=1.7.3", + "pydantic>=1.7.3, <3.0.0", "pystac>=1.0.0", "pystac-client>=0.2.0", "requests>=2.25.1", diff --git a/tests/test_misc.py b/tests/test_misc.py index cd415e50a13ce16b1abf4de2a09666ffd280b5a1..201cb1e8b0c97ffb878af0b6e6e8cb95fae3d21b 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -4,7 +4,14 @@ import dinamis_sdk import pkg_resources version_from_module = dinamis_sdk.__version__ -version_from_pkg = pkg_resources.require("dinamis-sdk")[0].version +from importlib.metadata import version, PackageNotFoundError + +try: + version_from_pkg = version("dinamis_sdk") +except PackageNotFoundError: + # package is not installed + version_from_pkg = "" + assert version_from_module assert version_from_pkg assert version_from_module == version_from_pkg, f"version from module is {version_from_module} but version from pkg is {version_from_pkg}"