From 4dfc3e6035c4ef6dda8773f6e511535105533f5b Mon Sep 17 00:00:00 2001 From: Tom Aldcroft Date: Tue, 26 Feb 2019 12:17:30 -0500 Subject: [PATCH] Merge pull request #89 from sot/no-test-version Remove use of test(get_version=True) for versioning --- sparkles/__init__.py | 2 +- sparkles/core.py | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sparkles/__init__.py b/sparkles/__init__.py index be8c4f0..2e35714 100644 --- a/sparkles/__init__.py +++ b/sparkles/__init__.py @@ -1,4 +1,4 @@ -__version__ = '4.1' +__version__ = '4.1.1' from .core import run_aca_review, ACAReviewTable diff --git a/sparkles/core.py b/sparkles/core.py index c348f06..b6d6fe7 100644 --- a/sparkles/core.py +++ b/sparkles/core.py @@ -33,19 +33,16 @@ from .roll_optimize import RollOptimizeMixin CACHE = {} -PROSECO_VERSION = proseco.test(get_version=True) FILEDIR = Path(__file__).parent def main(sys_args=None): """Command line interface to preview_load()""" - - from . import test - version = test(get_version=True) + from . import __version__ import argparse parser = argparse.ArgumentParser( - description=f'Sparkles ACA review tool {version}') + description=f'Sparkles ACA review tool {__version__}') parser.add_argument('load_name', type=str, help='Load name (e.g. JAN2119A) or full file name') @@ -199,12 +196,11 @@ def _run_aca_review(load_name=None, *, acars=None, make_html=True, report_dir=No # noinspection PyDictCreation if make_html: - from . import test - sparkles_version = test(get_version=True) + from . import __version__ context = {} context['load_name'] = load_name.upper() - context['proseco_version'] = PROSECO_VERSION - context['sparkles_version'] = sparkles_version + context['proseco_version'] = proseco.__version__ + context['sparkles_version'] = __version__ context['acas'] = acars context['summary_text'] = get_summary_text(acars)