Skip to content

Commit

Permalink
Merge 98043ac into 025c319
Browse files Browse the repository at this point in the history
  • Loading branch information
romain-dartigues committed Oct 26, 2020
2 parents 025c319 + 98043ac commit ba0e6a7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ An example .pydeps file::

[pydeps]
max_bacon = 2
no_show = True
verbose = 0
pylib = False
exclude =
Expand Down
11 changes: 4 additions & 7 deletions pydeps/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def parse_args(argv=()):
args.add('-o', default=None, kind="FNAME:output", dest='output', metavar="file", help="write output to 'file'")
args.add('-T', default='svg', dest='format', help="output format (svg|png)")
args.add('--display', kind="FNAME:exe", default=None, help="program to use to display the graph (png or svg file depending on the T parameter)", metavar="PROGRAM")
args.add('--noshow', '--no-show', action='store_true', help="don't call external program to display graph")
args.add('--noshow', '--no-show', action='store_true', default=False, dest='no_show', help="don't call external program to display graph")
args.add('--show-deps', action='store_true', help="show output of dependency analysis")
args.add('--show-raw-deps', action='store_true', help="show output of dependency analysis before removing skips")
args.add('--show-dot', action='store_true', help="show output of dot conversion")
Expand Down Expand Up @@ -156,18 +156,15 @@ def parse_args(argv=()):
return dict(
T='svg', config=None, debug=False, display=None, exclude=[], externals=True,
fname=_args.fname, format='svg', max_bacon=10, no_config=False, nodot=False,
noise_level=200, noshow=True, output=None, pylib=False, pylib_all=False,
noise_level=200, no_show=True, output=None, pylib=False, pylib_all=False,
show=False, show_cycles=False, show_deps=False, show_dot=False,
show_raw_deps=False, verbose=0, include_missing=True, reverse=False,
start_color=0, find_package=False,
)

_args.show = True

if _args.no_output:
_args.noshow = True
if _args.noshow:
_args.show = False
_args.no_show = True
_args.show = not _args.no_show
if _args.nodot and _args.show_cycles:
error("Can't use --nodot and --show-cycles together") # pragma: nocover
if _args.nodot:
Expand Down
2 changes: 1 addition & 1 deletion pydeps/pydeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def externals(trgt, **kwargs):
kw = dict(
T='svg', config=None, debug=False, display=None, exclude=[], exclude_exact=[],
externals=True, format='svg', max_bacon=2**65, no_config=True, nodot=False,
noise_level=2**65, noshow=True, output=None, pylib=True, pylib_all=True,
noise_level=2**65, no_show=True, output=None, pylib=True, pylib_all=True,
show=False, show_cycles=False, show_deps=False, show_dot=False,
show_raw_deps=False, verbose=0, include_missing=True, start_color=0
)
Expand Down

0 comments on commit ba0e6a7

Please sign in to comment.