diff --git a/reacnetgenerator/__init__.py b/reacnetgenerator/__init__.py index c7541c80a..71a49556a 100644 --- a/reacnetgenerator/__init__.py +++ b/reacnetgenerator/__init__.py @@ -1,16 +1,33 @@ # Copyright 2018-2019, East China Normal University """ReacNetGen.""" +__date__ = '2018-03-11' +__update__ = '2019-02-10' +__author__ = 'Jinzhe Zeng' +__email__ = 'jzzeng@stu.ecnu.edu.cn' +__credits__ = ['Jinzhe Zeng', 'Tong Zhu', + 'Liqun Cao', 'Chih-Hao Chin', 'John ZH Zhang'] +__copyright__ = 'Copyright 2018-2019, East China Normal University' + import logging + import coloredlogs import matplotlib as mpl mpl.use("svg") # noqa +from pkg_resources import DistributionNotFound, get_distribution + +from .reacnetgen import ReacNetGenerator -from .reacnetgen import ReacNetGenerator, __version__ __all__ = ['ReacNetGenerator'] +try: + __version__ = get_distribution(__name__).version +except DistributionNotFound: + # package is not installed + __version__ = '' + coloredlogs.install( fmt=f'%(asctime)s - ReacNetGen {__version__} - %(levelname)s: %(message)s', level=logging.INFO, milliseconds=True) diff --git a/reacnetgenerator/reacnetgen.py b/reacnetgenerator/reacnetgen.py index eb8b9fa9b..e0916527e 100644 --- a/reacnetgenerator/reacnetgen.py +++ b/reacnetgenerator/reacnetgen.py @@ -40,15 +40,6 @@ $ reacnetgenerator -h """ -__version__ = '1.2.25' -__date__ = '2018-03-11' -__update__ = '2019-02-01' -__author__ = 'Jinzhe Zeng' -__email__ = 'jzzeng@stu.ecnu.edu.cn' -__credits__ = ['Jinzhe Zeng', 'Tong Zhu', - 'Liqun Cao', 'Chih-Hao Chin', 'John ZH Zhang'] -__copyright__ = 'Copyright 2018-2019, East China Normal University' - import argparse import base64 @@ -61,8 +52,8 @@ from multiprocessing import cpu_count import numpy as np -from pkg_resources import DistributionNotFound, get_distribution +from . import __version__, __date__, __update__ from ._detect import InputFileType, _Detect from ._draw import _DrawNetwork from ._hmmfilter import _HMMFilter @@ -70,12 +61,6 @@ from ._path import _CollectPaths from ._reachtml import _HTMLResult -try: - __version__ = get_distribution(__name__).version -except DistributionNotFound: - # package is not installed - pass - class ReacNetGenerator: """Use ReacNetGenerator for trajectory analysis."""