diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-21 12:23:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 12:23:24 -0500 |
commit | de4eaa4f21c53a1d1da7d58ef2cda8ef28989fb6 (patch) | |
tree | e4b944dabc0d0fb692aaf830f48014a54f20fc76 /python/tidy/servo_tidy/tidy.py | |
parent | df1b00d43db615244e8e4bcf8296ed51b64249ea (diff) | |
parent | 536314be79ba0ee4a45e3afd027c7bdd4200d95c (diff) | |
download | servo-de4eaa4f21c53a1d1da7d58ef2cda8ef28989fb6.tar.gz servo-de4eaa4f21c53a1d1da7d58ef2cda8ef28989fb6.zip |
Auto merge of #12511 - asajeffrey:test-tidy-dep-licenses, r=larsbergstrom
Added test-tidy for dependent licenses.
<!-- Please describe your changes on the following line: -->
Add a test-tidy lint for dependency licenses. Note that #12507 should land first.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because we don't test our lints
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12511)
<!-- Reviewable:end -->
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r-- | python/tidy/servo_tidy/tidy.py | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 02e3263d64d..873af6ca22b 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -17,7 +17,7 @@ import site import StringIO import subprocess import sys -from licenseck import licenses, licenses_toml +from licenseck import licenses, licenses_toml, licenses_dep_toml # License and header checks EMACS_HEADER = "/* -*- Mode:" @@ -643,6 +643,28 @@ def check_wpt_lint_errors(files): yield ("WPT Lint Tool", "", "lint error(s) in Web Platform Tests: exit status {0}".format(returncode)) +def get_dep_toml_files(only_changed_files=False): + if not only_changed_files: + print '\nRunning the dependency licensing lint...' + for root, directories, filenames in os.walk(".cargo"): + for filename in filenames: + if filename == "Cargo.toml": + yield os.path.join(root, filename) + + +def check_dep_license_errors(filenames, progress=True): + filenames = progress_wrapper(filenames) if progress else filenames + for filename in filenames: + with open(filename, "r") as f: + ok_licensed = False + lines = f.readlines() + for idx, line in enumerate(lines): + for license_line in licenses_dep_toml: + ok_licensed |= (license_line in line) + if not ok_licensed: + yield (filename, 0, "dependency should contain a valid license.") + + def get_file_list(directory, only_changed_files=False, exclude_dirs=[]): if only_changed_files: # only check the files that have been changed since the last merge @@ -674,10 +696,12 @@ def scan(only_changed_files=False, progress=True): checking_functions = (check_flake8, check_lock, check_webidl_spec, check_json) line_checking_functions = (check_license, check_by_line, check_toml, check_rust, check_spec, check_modeline) errors = collect_errors_for_files(files_to_check, checking_functions, line_checking_functions) + # check dependecy licenses + dep_license_errors = check_dep_license_errors(get_dep_toml_files(only_changed_files), progress) # wpt lint checks wpt_lint_errors = check_wpt_lint_errors(get_wpt_files(only_changed_files, progress)) # collect errors - errors = itertools.chain(errors, wpt_lint_errors) + errors = itertools.chain(errors, dep_license_errors, wpt_lint_errors) error = None for error in errors: print "\r\033[94m{}\033[0m:\033[93m{}\033[0m: \033[91m{}\033[0m".format(*error) |