diff options
| -rw-r--r-- | python/requirements.txt | 2 | ||||
| -rw-r--r-- | python/tidy/servo_tidy/tidy.py | 65 | ||||
| -rw-r--r-- | python/tidy/servo_tidy_tests/duplicated_package.lock | 28 | ||||
| -rw-r--r-- | python/tidy/servo_tidy_tests/test_tidy.py | 16 |
4 files changed, 61 insertions, 50 deletions
diff --git a/python/requirements.txt b/python/requirements.txt index 34794fd5031..8248a21e930 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -4,7 +4,7 @@ mozdebug == 0.1 mozinfo == 0.8 mozlog == 3.3 setuptools == 18.5 -toml == 0.9.1 +toml == 0.9.2 Mako == 1.0.4 # For Python linting diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index c43b09a66a7..cae431205f8 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -301,61 +301,42 @@ def check_flake8(file_name, contents): def check_lock(file_name, contents): - def find_reverse_dependencies(dependency, version, content): - dependency_prefix = "{} {}".format(dependency, version) + def find_reverse_dependencies(name, content): for package in itertools.chain([content["root"]], content["package"]): for dependency in package.get("dependencies", []): - if dependency.startswith(dependency_prefix): - yield package["name"] + if dependency.startswith("{} ".format(name)): + yield package["name"], dependency if not file_name.endswith(".lock"): raise StopIteration - # package names to be neglected (as named by cargo) + # Package names to be neglected (as named by cargo) exceptions = config["ignore"]["packages"] - # toml.py has a bug(?) that we trip up in [metadata] sections; - # see https://github.com/uiri/toml/issues/61 - # This should only affect a very few lines (that have embedded ?branch=...), - # and most of them won't be in the repo - try: - content = toml.loads(contents) - except: - print "WARNING!" - print "WARNING! toml parsing failed for Cargo.lock, but ignoring..." - print "WARNING!" - raise StopIteration + content = toml.loads(contents) - packages = {} + packages_by_name = {} for package in content.get("package", []): - packages.setdefault(package["name"], []).append(package["version"]) + source = package.get("source", "") + if source == r"registry+https://github.com/rust-lang/crates.io-index": + source = "crates.io" + packages_by_name.setdefault(package["name"], []).append((package["version"], source)) - for (name, versions) in packages.iteritems(): - if name in exceptions or len(versions) <= 1: + for (name, packages) in packages_by_name.iteritems(): + if name in exceptions or len(packages) <= 1: continue - highest = max(versions) - for version in versions: - if version != highest: - reverse_dependencies = "\n".join( - "\t\t{}".format(n) - for n in find_reverse_dependencies(name, version, content) - ) - substitutions = { - "package": name, - "old_version": version, - "new_version": highest, - "reverse_dependencies": reverse_dependencies - } - message = """ -duplicate versions for package "{package}" -\t\033[93mfound dependency on version {old_version}\033[0m -\t\033[91mbut highest version is {new_version}\033[0m -\t\033[93mtry upgrading with\033[0m \033[96m./mach cargo-update -p {package}:{old_version}\033[0m -\tThe following packages depend on version {old_version}: -{reverse_dependencies} -""".format(**substitutions).strip() - yield (1, message) + message = "duplicate versions for package `{}`".format(name) + packages.sort() + packages_dependencies = list(find_reverse_dependencies(name, content)) + for version, source in packages: + short_source = source.split("#")[0].replace("git+", "") + message += "\n\t\033[93mThe following packages depend on version {} from '{}':\033[0m" \ + .format(version, short_source) + for name, dependency in packages_dependencies: + if version in dependency and short_source in dependency: + message += "\n\t\t" + name + yield (1, message) def check_toml(file_name, lines): diff --git a/python/tidy/servo_tidy_tests/duplicated_package.lock b/python/tidy/servo_tidy_tests/duplicated_package.lock index 77777fdd82c..6075f99164c 100644 --- a/python/tidy/servo_tidy_tests/duplicated_package.lock +++ b/python/tidy/servo_tidy_tests/duplicated_package.lock @@ -15,7 +15,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "test2" version = "0.1.0" -source = "git+https://github.com/" +source = "git+https://github.com/user/test2#c54edsf" dependencies = [ "test 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", ] + +[[package]] +name = "test3" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "test3" +version = "0.5.1" +source = "git+https://github.com/user/test3#c54edsf" + +[[package]] +name = "test4" +version = "0.1.0" +source = "git+https://github.com/user/test4#c54edsf" +dependencies = [ + "test3 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "test5" +version = "0.1.0" +source = "git+https://github.com/" +dependencies = [ + "test3 0.5.1 (git+https://github.com/user/test3)", +] diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py index 265c485a106..7adcbda2dfe 100644 --- a/python/tidy/servo_tidy_tests/test_tidy.py +++ b/python/tidy/servo_tidy_tests/test_tidy.py @@ -200,13 +200,17 @@ class CheckTidiness(unittest.TestCase): def test_lock(self): errors = tidy.collect_errors_for_files(iterFile('duplicated_package.lock'), [tidy.check_lock], [], print_text=False) - msg = """duplicate versions for package "test" -\t\033[93mfound dependency on version 0.4.9\033[0m -\t\033[91mbut highest version is 0.5.1\033[0m -\t\033[93mtry upgrading with\033[0m \033[96m./mach cargo-update -p test:0.4.9\033[0m -\tThe following packages depend on version 0.4.9: -\t\ttest2""" + msg = """duplicate versions for package `test` +\t\x1b[93mThe following packages depend on version 0.4.9 from 'crates.io':\x1b[0m +\t\ttest2 +\t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m""" self.assertEqual(msg, errors.next()[2]) + msg2 = """duplicate versions for package `test3` +\t\x1b[93mThe following packages depend on version 0.5.1 from 'crates.io':\x1b[0m +\t\ttest4 +\t\x1b[93mThe following packages depend on version 0.5.1 from 'https://github.com/user/test3':\x1b[0m +\t\ttest5""" + self.assertEqual(msg2, errors.next()[2]) self.assertNoMoreErrors(errors) def test_lint_runner(self): |