diff --git a/python/damask/_colormap.py b/python/damask/_colormap.py index d3ed4b12e..f354af0a3 100644 --- a/python/damask/_colormap.py +++ b/python/damask/_colormap.py @@ -7,7 +7,7 @@ import matplotlib.pyplot as plt from matplotlib import cm import damask -from damask import Table +from . import Table _eps = 216./24389. _kappa = 24389./27. @@ -209,7 +209,7 @@ class Colormap(mpl.colors.ListedColormap): colors+=[i]+c out = [{ - 'Creator':f'damask.Colormap {damask.version}', + 'Creator':f'damask.Colormap v{damask.version}', 'ColorSpace':'RGB', 'Name':colormap.name, 'DefaultMap':True, @@ -226,7 +226,7 @@ class Colormap(mpl.colors.ListedColormap): """Write colormap to ASCII table.""" labels = {'R':(1,),'G':(1,),'B':(1,)} if colormap.colors.shape[1] == 4: labels['alpha']=(1,) - t = Table(colormap.colors,labels,f'Creator: damask.Colormap {damask.version}') + t = Table(colormap.colors,labels,f'Creator: damask.Colormap v{damask.version}') if fhandle is None: with open(colormap.name.replace(' ','_')+'.txt', 'w') as f: diff --git a/python/damask/_result.py b/python/damask/_result.py index 354c1c3f7..472355ae2 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -12,6 +12,7 @@ from functools import partial import h5py import numpy as np +import damask from . import VTK from . import Table from . import Rotation @@ -20,7 +21,6 @@ from . import Environment from . import grid_filters from . import mechanics from . import util -from . import version class Result: @@ -1090,7 +1090,7 @@ class Result: for l,v in result[1]['meta'].items(): dataset.attrs[l]=v.encode() - creator = f"damask.Result.{dataset.attrs['Creator'].decode()} v{version}" + creator = f"damask.Result.{dataset.attrs['Creator'].decode()} v{damask.version}" dataset.attrs['Creator'] = creator.encode() except (OSError,RuntimeError) as err: diff --git a/python/damask/_vtk.py b/python/damask/_vtk.py index f4855820e..0b9fde387 100644 --- a/python/damask/_vtk.py +++ b/python/damask/_vtk.py @@ -6,9 +6,9 @@ import vtk from vtk.util.numpy_support import numpy_to_vtk as np_to_vtk from vtk.util.numpy_support import numpy_to_vtkIdTypeArray as np_to_vtkIdTypeArray +import damask from . import Table from . import Environment -from . import version class VTK: @@ -214,7 +214,7 @@ class VTK: def __repr__(self): """ASCII representation of the VTK data.""" writer = vtk.vtkDataSetWriter() - writer.SetHeader(f'# DAMASK.VTK v{version}') + writer.SetHeader(f'# damask.VTK v{damask.version}') writer.WriteToOutputStringOn() writer.SetInputData(self.geom) writer.Write()