diff --git a/epyt/__init__.py b/epyt/__init__.py index 85cf68c..f48588b 100644 --- a/epyt/__init__.py +++ b/epyt/__init__.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- __author__ = """Marios S. Kyriakou""" __email__ = "kiriakou.marios@ucy.ac.cy" -__version__ = "1.0.9-beta.3" +__version__ = "1.0.9-beta.4" +__msxversion__ = "2.0.0" __copyright__ = """Copyright 2022, KIOS Research and Innovation Center of Excellence (KIOS CoE), University of Cyprus (www.kios.org.cy).""" __license__ = "EUPL License, Version 1.2" diff --git a/epyt/epanet.py b/epyt/epanet.py index 6e0545c..bbe4d2b 100644 --- a/epyt/epanet.py +++ b/epyt/epanet.py @@ -64,7 +64,7 @@ c_char_p import matplotlib.pyplot as plt from datetime import datetime -from epyt import __version__ +from epyt import __version__, __msxversion__ from shutil import copyfile from matplotlib import cm import matplotlib as mpl @@ -11165,6 +11165,7 @@ def loadMSXFile(self, msxname, ignore_properties=False): self.msxname = msxname[:-4] + '_temp.msx' copyfile(msxname, self.msxname) self.msx = epanetmsxapi(self.msxname) + print(f'MSX version {__msxversion__}.') if ignore_properties: self.msx.MSXEquationsTerms = self.getMSXEquationsTerms() diff --git a/setup.py b/setup.py index e208100..362d078 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ from setuptools import setup import os + # python setup.py bdist_wheel # python setup.py sdist # twine upload dist/* --config-file .pypirc @@ -18,6 +19,7 @@ def read_version_from_init(file_path="epyt/__init__.py"): else: raise RuntimeError("Unable to find version string.") + __version__ = read_version_from_init() module_name = 'epyt' data = list()