diff --git a/src/amuse/__init__.py b/src/amuse/__init__.py index 4f56025ec9..230556c485 100644 --- a/src/amuse/__init__.py +++ b/src/amuse/__init__.py @@ -56,7 +56,4 @@ def get_data(path): return os.path.join(_AMUSE_ROOT, "data", path) -try: - from amuse._version import __version__ -except ImportError: - __version__ = "unknown version" +from amuse._version import __version__ diff --git a/src/amuse/support/literature.py b/src/amuse/support/literature.py index e7a3418651..b0dac4e44e 100644 --- a/src/amuse/support/literature.py +++ b/src/amuse/support/literature.py @@ -17,10 +17,7 @@ from collections import namedtuple from docutils import nodes from amuse.support import exceptions -try: - from amuse._version import version as amuse_version -except ImportError: - amuse_version = "unknown version" +from amuse._version import __version__ as amuse_version import amuse @@ -283,11 +280,11 @@ def version(cls): version = importlib.import_module( '.._version', cls.__module__ - ).version + ).__version__ except (ImportError, ValueError): try: - from amuse.version import version - version = f"framework {version}" + from amuse._version import __version__ + version = f"framework {__version__}" except ImportError: version = "unknown version" return version