Skip to content

rename --version flag to --version_tb to avoid conflict #2153

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

Merged
nfelt merged 1 commit into from
Apr 25, 2019
Merged

rename --version flag to --version_tb to avoid conflict #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions tensorboard/plugins/core/core_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,12 @@ def define_flags(self, parser):

See tensorboard/backend/event_processing/event_file_inspector.py for more info.\
''')


# This flag has a "_tb" suffix to avoid conflicting with an internal flag
# named --version. Note that due to argparse auto-expansion of unambiguous
# flag prefixes, you can still invoke this as `tensorboard --version`.
parser.add_argument(
'--version',
'--version_tb',
action='store_true',
help='Prints the version of Tensorboard')

Expand Down Expand Up @@ -464,8 +467,8 @@ def define_flags(self, parser):
def fix_flags(self, flags):
"""Fixes standard TensorBoard CLI flags to parser."""
FlagsError = base_plugin.FlagsError
if flags.version:
pass
if flags.version_tb:
pass
elif flags.inspect:
if flags.logdir and flags.event_file:
raise FlagsError(
Expand Down
6 changes: 3 additions & 3 deletions tensorboard/plugins/core/core_plugin_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ class FakeFlags(object):
def __init__(
self,
inspect=False,
version=False,
version_tb=False,
logdir='',
event_file='',
db='',
path_prefix=''):
self.inspect = inspect
self.version = version
self.version_tb = version_tb
self.logdir = logdir
self.event_file = event_file
self.db = db
Expand Down Expand Up @@ -81,8 +81,8 @@ def testRoutesProvided(self):

def testFlag(self):
loader = core_plugin.CorePluginLoader()
loader.fix_flags(FakeFlags(version_tb=True))
loader.fix_flags(FakeFlags(inspect=True, logdir='/tmp'))
loader.fix_flags(FakeFlags(version=True))
loader.fix_flags(FakeFlags(inspect=True, event_file='/tmp/event.out'))
loader.fix_flags(FakeFlags(inspect=False, logdir='/tmp'))
loader.fix_flags(FakeFlags(inspect=False, db='sqlite:foo'))
Expand Down
2 changes: 1 addition & 1 deletion tensorboard/program.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def main(self, ignored_argv=('',)):
event_file = os.path.expanduser(self.flags.event_file)
efi.inspect(self.flags.logdir, event_file, self.flags.tag)
return 0
if self.flags.version:
if self.flags.version_tb:
print(version.VERSION)
return 0
try:
Expand Down