Skip to content

adjusting where inconsistency is set. if we are inconsistent, but the… #7152

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
scbedd merged 6 commits into from
Sep 10, 2019
Merged

adjusting where inconsistency is set. if we are inconsistent, but the… #7152

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a29e4f
adjusting where inconsistency is set. if we are inconsistent, but the…
scbedd Sep 9, 2019
955e909
updating logic to account for edge case where frozen file exists, but…
scbedd Sep 9, 2019
f98747d
Fix for bailing out from writing a lockfile with inconsistencies
Sep 9, 2019
b7266b8
Fix writing a lockfile on Python2
Sep 9, 2019
647c54e
Improve verbose output formatting
Sep 9, 2019
47b1e87
Display dependency consistency msg in all cases
Sep 9, 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
Prev Previous commit
Next Next commit
updating logic to account for edge case where frozen file exists, but… 
… doesn't have any contents. we will falsely miss setting exitcode(1)
  • Loading branch information
@scbedd
scbedd committed Sep 9, 2019
commit 955e9090d6b60a6da68eef3167dbc87e17dce28e
19 changes: 9 additions & 10 deletions scripts/analyze_deps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,6 @@ def render_report(output_path, report_context):
print(' * %s' % (lib))

exitcode = 0
if inconsistent:
if not args.verbose:
print('\n\nIncompatible dependency versions detected in libraries, run this script with --verbose for details')
else:
print('\n')
else:
print('\n\nAll library dependencies verified, no incompatible versions detected')

frozen_filename = os.path.join(base_dir, 'shared_requirements.txt')
if args.freeze:
Expand Down Expand Up @@ -256,9 +249,7 @@ def render_report(output_path, report_context):
frozen[req_name] = [spec]
except:
print('Unable to open shared_requirements.txt, shared requirements have not been validated')
if inconsistent:
exitcode = 1


missing_reqs, new_reqs, changed_reqs = {}, {}, {}
non_overridden_reqs_count = 0
if frozen:
Expand Down Expand Up @@ -303,6 +294,14 @@ def render_report(output_path, report_context):
print("\nThe following libraries declare requirement '%s' which does not match the frozen requirement '%s':" % (changed_req + spec, changed_req + frozen_specs[0]))
for lib in non_overridden_libs:
print(" * %s" % (lib))
elif inconsistent:
exitcode = 1
if not args.verbose:
print('\n\nIncompatible dependency versions detected in libraries, run this script with --verbose for details')
else:
print('\n')
else:
print('\n\nAll library dependencies verified, no incompatible versions detected')

if args.out:
external = [k for k in dependencies if k not in packages and not should_skip_lib(k)]
Expand Down