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

Jump to bottom

Addition of version information to package and command line #205

Merged
merged 3 commits into from
Dec 3, 2019
Merged

Addition of version information to package and command line #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bcad5c
Addition of version information.
Dec 3, 2019
fbeea8b
Tweak to have setup.py pull from __version__
Dec 3, 2019
9584bf6
Addition of command line arg to print version.
Dec 3, 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
3 changes: 3 additions & 0 deletions maestrowf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ def emit(self, record):

LOGGER = logging.getLogger(__name__)
LOGGER.addHandler(NullHandler())

__version_info__ = ("1", "1", "5dev")
__version__ = '.'.join(__version_info__)
3 changes: 3 additions & 0 deletions maestrowf/maestro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import tabulate
import time

from maestrowf import __version__
from maestrowf.conductor import monitor_study
from maestrowf.datastructures import YAMLSpecification
from maestrowf.datastructures.core import Study
Expand Down Expand Up @@ -392,6 +393,8 @@ def setup_argparser():
parser.add_argument(
"-c", "--logstdout", action="store_true", default=True,
help="Log to stdout in addition to a file. [Default: %(default)s]")
parser.add_argument(
"-v", "--version", action="version", version='%(prog)s ' + __version__)

return parser

Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from maestrowf import __version__
from setuptools import setup, find_packages

setup(name='maestrowf',
description='A tool and library for specifying and conducting general '
'workflows.',
version='1.1.5dev',
version=__version__,
author='Francesco Di Natale',
author_email='dinatale3@llnl.gov',
url='https://github.com/llnl/maestrowf',
Expand Down