From e5476651675232643b8e44c3790a0dd51d540a37 Mon Sep 17 00:00:00 2001 From: Lester Hedges Date: Tue, 16 Dec 2025 09:34:18 +0000 Subject: [PATCH] Handle git revision ID failure. [closes #493] --- .../Sandpit/Exscientia/Stream/_stream.py | 20 +++++++++++-------- python/BioSimSpace/Stream/_stream.py | 6 +++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/python/BioSimSpace/Sandpit/Exscientia/Stream/_stream.py b/python/BioSimSpace/Sandpit/Exscientia/Stream/_stream.py index a263a9d4..15bff0d4 100644 --- a/python/BioSimSpace/Sandpit/Exscientia/Stream/_stream.py +++ b/python/BioSimSpace/Sandpit/Exscientia/Stream/_stream.py @@ -42,12 +42,12 @@ def save(sire_object, filebase): filebase : str The base name of the binary output file. """ - from .. import _isVerbose - from .. import _SireWrappers from sire import stream as _NewSireStream from .._Exceptions import StreamError as _StreamError - from .._SireWrappers._sire_wrapper import SireWrapper as _SireWrapper + from .. import _isVerbose from sire import system as _NewSireSystem + from .. import _SireWrappers + from .._SireWrappers._sire_wrapper import SireWrapper as _SireWrapper # Validate input. @@ -91,13 +91,13 @@ def load(file): file : str The path to the binary file containing the streamed object. """ - from .. import _isVerbose - from .. import _SireWrappers from sire import stream as _NewSireStream from sire.legacy import Mol as _SireMol - import os as _os from .._Exceptions import StreamError as _StreamError + from .. import _isVerbose from sire import system as _NewSireSystem + from .. import _SireWrappers + import os as _os # Validate input. @@ -242,8 +242,8 @@ def _add_metadata(sire_object): The metadata associated with the object. """ from sire import stream as _NewSireStream - from .._SireWrappers._sire_wrapper import SireWrapper as _SireWrapper from .. import _SireWrappers + from .._SireWrappers._sire_wrapper import SireWrapper as _SireWrapper if not isinstance(sire_object, _SireWrapper) and not isinstance( sire_object, _SireWrappers.SearchResult @@ -264,7 +264,11 @@ def _add_metadata(sire_object): # Extract the BioSimSpace version and revision ID. _bss_version = _version.get_versions()["version"].split("+")[0] - _bss_revisionid = _version.get_versions()["full-revisionid"][0:7] + _bss_revisionid = _version.get_versions()["full-revisionid"] + if _bss_revisionid is not None: + _bss_revisionid = _bss_revisionid[0:7] + else: + _bss_revisionid = "None" # Create the object name. obj_name = f"{sire_object.__module__}.{sire_object.__class__.__name__}" diff --git a/python/BioSimSpace/Stream/_stream.py b/python/BioSimSpace/Stream/_stream.py index e75585a5..15bff0d4 100644 --- a/python/BioSimSpace/Stream/_stream.py +++ b/python/BioSimSpace/Stream/_stream.py @@ -264,7 +264,11 @@ def _add_metadata(sire_object): # Extract the BioSimSpace version and revision ID. _bss_version = _version.get_versions()["version"].split("+")[0] - _bss_revisionid = _version.get_versions()["full-revisionid"][0:7] + _bss_revisionid = _version.get_versions()["full-revisionid"] + if _bss_revisionid is not None: + _bss_revisionid = _bss_revisionid[0:7] + else: + _bss_revisionid = "None" # Create the object name. obj_name = f"{sire_object.__module__}.{sire_object.__class__.__name__}"