Skip to content

Commit

Permalink
Merge pull request #89 from sot/no-test-version
Browse files Browse the repository at this point in the history
Remove use of test(get_version=True) for versioning
  • Loading branch information
taldcroft committed Feb 26, 2019
1 parent 09d9ea3 commit 4dfc3e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion sparkles/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '4.1'
__version__ = '4.1.1'

from .core import run_aca_review, ACAReviewTable

Expand Down
14 changes: 5 additions & 9 deletions sparkles/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 4dfc3e6

Please sign in to comment.