From 8945e964e5317134d4b9f45cb7aa5dfa25331ecf Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Tue, 4 Jun 2024 14:23:19 +0200 Subject: [PATCH 1/3] Get package version from pyproject.toml Signed-off-by: paul.profizi --- src/ansys/dpf/core/__init__.py | 3 ++- src/ansys/dpf/core/_version.py | 8 -------- src/ansys/dpf/core/server_types.py | 4 ++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/ansys/dpf/core/__init__.py b/src/ansys/dpf/core/__init__.py index 83720985854..4af58bbaf2b 100644 --- a/src/ansys/dpf/core/__init__.py +++ b/src/ansys/dpf/core/__init__.py @@ -1,8 +1,9 @@ import os import pkg_resources -from ansys.dpf.core._version import __version__ +import importlib.metadata as importlib_metadata +__version__ = importlib_metadata.version(__name__.replace(".", "-")) # Setup data directory USER_DATA_PATH = None diff --git a/src/ansys/dpf/core/_version.py b/src/ansys/dpf/core/_version.py index 62be546ceda..91c0d687ee1 100644 --- a/src/ansys/dpf/core/_version.py +++ b/src/ansys/dpf/core/_version.py @@ -1,12 +1,4 @@ """Version for ansys-dpf-core""" -# major, minor, patch - -version_info = 0, 12, 3, "dev0" - - -# Nice string for the version -__version__ = ".".join(map(str, version_info)) - # Minimal DPF server version supported min_server_version = "4.0" diff --git a/src/ansys/dpf/core/server_types.py b/src/ansys/dpf/core/server_types.py index 529ebc7bc17..0d842e74c36 100644 --- a/src/ansys/dpf/core/server_types.py +++ b/src/ansys/dpf/core/server_types.py @@ -21,8 +21,8 @@ import ansys.dpf.core as core from ansys.dpf.core.check_version import server_meet_version -from ansys.dpf.core import errors, server_factory -from ansys.dpf.core._version import min_server_version, server_to_ansys_version, __version__ +from ansys.dpf.core import errors, server_factory, __version__ +from ansys.dpf.core._version import min_server_version, server_to_ansys_version from ansys.dpf.core import server_context from ansys.dpf.gate import load_api, data_processing_grpcapi From 6a02ae39a2049c505948d6980bffd6fb280194b4 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Tue, 4 Jun 2024 14:35:17 +0200 Subject: [PATCH 2/3] Make it retro-compatible with old Python versions in older DPF servers Signed-off-by: paul.profizi --- src/ansys/dpf/core/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ansys/dpf/core/__init__.py b/src/ansys/dpf/core/__init__.py index 4af58bbaf2b..99394974cc2 100644 --- a/src/ansys/dpf/core/__init__.py +++ b/src/ansys/dpf/core/__init__.py @@ -1,7 +1,10 @@ import os import pkg_resources -import importlib.metadata as importlib_metadata +try: + import importlib.metadata as importlib_metadata +except ImportError: # Python < 3.10 (backport) + import importlib_metadata as importlib_metadata __version__ = importlib_metadata.version(__name__.replace(".", "-")) From 44139a7a34c74968be8e52fe29606378668e300a Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Tue, 4 Jun 2024 15:50:12 +0200 Subject: [PATCH 3/3] Fix package name for importlib_metadata.version Signed-off-by: paul.profizi --- src/ansys/dpf/core/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/dpf/core/__init__.py b/src/ansys/dpf/core/__init__.py index 99394974cc2..a981fa661b7 100644 --- a/src/ansys/dpf/core/__init__.py +++ b/src/ansys/dpf/core/__init__.py @@ -6,7 +6,7 @@ except ImportError: # Python < 3.10 (backport) import importlib_metadata as importlib_metadata -__version__ = importlib_metadata.version(__name__.replace(".", "-")) +__version__ = importlib_metadata.version("ansys-dpf-core") # Setup data directory USER_DATA_PATH = None