Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove use of test(get_version=True) for versioning #89

Merged
merged 2 commits into from
Feb 26, 2019
Merged

Remove use of test(get_version=True) for versioning #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c69e5
Remove use of test(get_version=True) for versioning
taldcroft Feb 26, 2019
0ae1cf6
Update version to 4.1.1
taldcroft Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sparkles/__init__.py
View file
Open in desktop
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
View file
Open in desktop
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