mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Convert tidy to a non-egg Python package
It seems that servo-tidy is only used by webrender in my GitHub searches. WebRender could simply use `rustfmt` and the tidy on pypi hasn't been updated since 2018. Converting tidy to a normal Python package removes the maintenance burden of continually fixing the easy install configuration. Fixes #29094. Fixes #29334.
This commit is contained in:
parent
fa266abd29
commit
81433a8684
54 changed files with 68 additions and 266 deletions
|
@ -1,45 +0,0 @@
|
|||
# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
|
||||
# file at the top-level directory of this distribution.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
# option. This file may not be copied, modified, or distributed
|
||||
# except according to those terms.
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
from servo_tidy.tidy import LintRunner, filter_file
|
||||
|
||||
WPT_PATH = os.path.join(".", "tests", "wpt")
|
||||
SUITES = ["web-platform-tests", os.path.join("mozilla", "tests")]
|
||||
|
||||
|
||||
class Lint(LintRunner):
|
||||
def _get_wpt_files(self, suite):
|
||||
working_dir = os.path.join(WPT_PATH, suite, '')
|
||||
file_iter = self.get_files(working_dir, exclude_dirs=[])
|
||||
print('\nRunning the WPT lint on %s...' % working_dir)
|
||||
for f in file_iter:
|
||||
if filter_file(f):
|
||||
yield f[len(working_dir):]
|
||||
|
||||
def run(self):
|
||||
if self.stylo or self.no_wpt:
|
||||
return
|
||||
|
||||
wpt_working_dir = os.path.abspath(os.path.join(WPT_PATH, "web-platform-tests"))
|
||||
for suite in SUITES:
|
||||
files = list(self._get_wpt_files(suite))
|
||||
if not files:
|
||||
continue
|
||||
sys.path.insert(0, wpt_working_dir)
|
||||
from tools.lint import lint
|
||||
file_dir = os.path.abspath(os.path.join(WPT_PATH, suite))
|
||||
returncode = lint.lint(file_dir, files, output_format="json")
|
||||
sys.path.remove(wpt_working_dir)
|
||||
if returncode:
|
||||
yield ("WPT Lint Tool", "", "lint error(s) in Web Platform Tests: exit status %s" % returncode)
|
|
@ -31,14 +31,12 @@ from mach.decorators import (
|
|||
CommandProvider,
|
||||
Command,
|
||||
)
|
||||
import tidy
|
||||
|
||||
from servo_tidy import tidy
|
||||
from servo.command_base import (
|
||||
CommandBase,
|
||||
call, check_call, check_output,
|
||||
)
|
||||
from servo_tidy_tests import test_tidy
|
||||
|
||||
from servo.util import delete
|
||||
from distutils.dir_util import copy_tree
|
||||
|
||||
|
@ -298,7 +296,7 @@ class MachCommands(CommandBase):
|
|||
help="Only handle files in the stylo tree")
|
||||
def test_tidy(self, all_files, no_progress, self_test, stylo, force_cpp=False, no_wpt=False):
|
||||
if self_test:
|
||||
return test_tidy.do_tests()
|
||||
return tidy.do_tests()
|
||||
else:
|
||||
if no_wpt:
|
||||
manifest_dirty = False
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue