diff --git a/python/mozperftest/mozperftest/mach_commands.py b/python/mozperftest/mozperftest/mach_commands.py index f55d9588768d..6aca26618856 100644 --- a/python/mozperftest/mozperftest/mach_commands.py +++ b/python/mozperftest/mozperftest/mach_commands.py @@ -106,9 +106,7 @@ class PerftestTests(MachCommandBase): return False @Command( - "perftest-test", - category="testing", - description="Run perftest tests", + "perftest-test", category="testing", description="Run perftest tests", ) @CommandArgument( "tests", default=None, nargs="*", help="Tests to run. By default will run all" @@ -121,11 +119,7 @@ class PerftestTests(MachCommandBase): help="Skip flake8 and black", ) @CommandArgument( - "-v", - "--verbose", - action="store_true", - default=False, - help="Verbose mode", + "-v", "--verbose", action="store_true", default=False, help="Verbose mode", ) def run_tests(self, **kwargs): MachCommandBase.activate_virtualenv(self) diff --git a/python/mozperftest/mozperftest/metrics/consoleoutput.py b/python/mozperftest/mozperftest/metrics/consoleoutput.py index 97757be8ac66..3c7fac0783c3 100644 --- a/python/mozperftest/mozperftest/metrics/consoleoutput.py +++ b/python/mozperftest/mozperftest/metrics/consoleoutput.py @@ -17,7 +17,8 @@ RESULTS_TEMPLATE = """\ class ConsoleOutput(Layer): - """Output metrics in the console.""" + """Output metrics in the console. + """ name = "console" activated = False diff --git a/python/mozperftest/mozperftest/metrics/notebook/constant.py b/python/mozperftest/mozperftest/metrics/notebook/constant.py index ca40d289d423..65cf8e60609c 100644 --- a/python/mozperftest/mozperftest/metrics/notebook/constant.py +++ b/python/mozperftest/mozperftest/metrics/notebook/constant.py @@ -9,7 +9,8 @@ from .transformer import get_transformers class Constant(object): - """A singleton class to store all constants.""" + """A singleton class to store all constants. + """ __instance = None diff --git a/python/mozperftest/mozperftest/metrics/notebook/transformer.py b/python/mozperftest/mozperftest/metrics/notebook/transformer.py index 4d996d2e531e..a9c4f3cd85e0 100644 --- a/python/mozperftest/mozperftest/metrics/notebook/transformer.py +++ b/python/mozperftest/mozperftest/metrics/notebook/transformer.py @@ -17,7 +17,8 @@ from mozperftest.runner import HERE class Transformer(object): - """Abstract class for data transformers.""" + """Abstract class for data transformers. + """ def __init__(self, files=None, custom_transformer=None, logger=None, prefix=None): """Initialize the transformer with files. @@ -131,7 +132,8 @@ class Transformer(object): class SimplePerfherderTransformer: - """Transforms perfherder data into the standardized data format.""" + """Transforms perfherder data into the standardized data format. + """ entry_number = 0 diff --git a/python/mozperftest/mozperftest/metrics/notebook/transforms/single_json.py b/python/mozperftest/mozperftest/metrics/notebook/transforms/single_json.py index 0c844cceec4d..95f93e4f2d4f 100644 --- a/python/mozperftest/mozperftest/metrics/notebook/transforms/single_json.py +++ b/python/mozperftest/mozperftest/metrics/notebook/transforms/single_json.py @@ -5,7 +5,8 @@ from mozperftest.metrics.notebook.utilities import flat class SingleJsonRetriever: - """Transforms perfherder data into the standardized data format.""" + """Transforms perfherder data into the standardized data format. + """ entry_number = 0 diff --git a/python/mozperftest/mozperftest/metrics/perfherder.py b/python/mozperftest/mozperftest/metrics/perfherder.py index 94fe3f67b993..aba753122981 100644 --- a/python/mozperftest/mozperftest/metrics/perfherder.py +++ b/python/mozperftest/mozperftest/metrics/perfherder.py @@ -20,7 +20,8 @@ PERFHERDER_SCHEMA = pathlib.Path( class Perfherder(Layer): - """Output data in the perfherder format.""" + """Output data in the perfherder format. + """ name = "perfherder" activated = False diff --git a/python/mozperftest/mozperftest/metrics/visualmetrics.py b/python/mozperftest/mozperftest/metrics/visualmetrics.py index ec42ddf88f03..c560961bb857 100644 --- a/python/mozperftest/mozperftest/metrics/visualmetrics.py +++ b/python/mozperftest/mozperftest/metrics/visualmetrics.py @@ -40,7 +40,8 @@ class VisualData: class VisualMetrics(Layer): - """Wrapper around Browsertime's visualmetrics.py script""" + """Wrapper around Browsertime's visualmetrics.py script + """ name = "visualmetrics" activated = False diff --git a/python/mozperftest/mozperftest/runner.py b/python/mozperftest/mozperftest/runner.py index a6d69ca4b4e8..4776a0ac009e 100644 --- a/python/mozperftest/mozperftest/runner.py +++ b/python/mozperftest/mozperftest/runner.py @@ -155,7 +155,8 @@ def run_tests(mach_cmd, **kwargs): def main(argv=sys.argv[1:]): - """Used when the runner is directly called from the shell""" + """Used when the runner is directly called from the shell + """ _setup_path() from mozbuild.mozconfig import MozconfigLoader diff --git a/python/mozperftest/mozperftest/system/__init__.py b/python/mozperftest/mozperftest/system/__init__.py index e686df253260..f35d725954e1 100644 --- a/python/mozperftest/mozperftest/system/__init__.py +++ b/python/mozperftest/mozperftest/system/__init__.py @@ -14,15 +14,7 @@ def get_layers(): def pick_system(env, flavor, mach_cmd): if flavor in ("desktop-browser", "xpcshell"): - return Layers( - env, - mach_cmd, - ( - MacosDevice, - Profile, - ProxyRunner, - ), - ) + return Layers(env, mach_cmd, (MacosDevice, Profile, ProxyRunner,)) if flavor == "mobile-browser": return Layers(env, mach_cmd, (Profile, ProxyRunner, AndroidDevice)) raise NotImplementedError(flavor) diff --git a/python/mozperftest/mozperftest/system/android.py b/python/mozperftest/mozperftest/system/android.py index be8f5ae1d957..8972acd106be 100644 --- a/python/mozperftest/mozperftest/system/android.py +++ b/python/mozperftest/mozperftest/system/android.py @@ -58,7 +58,8 @@ class ADBLoggedDevice(ADBDevice): class AndroidDevice(Layer): - """Use an android device via ADB""" + """Use an android device via ADB + """ name = "android" activated = False diff --git a/python/mozperftest/mozperftest/system/android_perf_tuner.py b/python/mozperftest/mozperftest/system/android_perf_tuner.py index 924ddd0c9e8b..b807de2e5d73 100644 --- a/python/mozperftest/mozperftest/system/android_perf_tuner.py +++ b/python/mozperftest/mozperftest/system/android_perf_tuner.py @@ -39,8 +39,7 @@ class PerformanceTuner: def _set_value_and_check_exitcode(self, file_name, value): self.log.info("setting {} to {}".format(file_name, value)) if self.device.shell_bool( - " ".join(["echo", str(value), ">", str(file_name)]), - timeout=self.timeout, + " ".join(["echo", str(value), ">", str(file_name)]), timeout=self.timeout, ): self.log.info("successfully set {} to {}".format(file_name, value)) else: diff --git a/python/mozperftest/mozperftest/system/macos.py b/python/mozperftest/mozperftest/system/macos.py index f3a0bf7cde4c..d8f01a65ffda 100644 --- a/python/mozperftest/mozperftest/system/macos.py +++ b/python/mozperftest/mozperftest/system/macos.py @@ -21,7 +21,8 @@ POTENTIAL_DMGS = { class MacosDevice(Layer): - """Runs on macOS to mount DMGs if we see one.""" + """Runs on macOS to mount DMGs if we see one. + """ name = "macos" activated = platform.system() == "Darwin" diff --git a/python/mozperftest/mozperftest/system/proxy.py b/python/mozperftest/mozperftest/system/proxy.py index 02aeacff7a3a..5442d61484b3 100644 --- a/python/mozperftest/mozperftest/system/proxy.py +++ b/python/mozperftest/mozperftest/system/proxy.py @@ -58,7 +58,8 @@ class OutputHandler(object): class ProxyRunner(Layer): - """Use a proxy""" + """Use a proxy + """ name = "proxy" activated = False diff --git a/python/mozperftest/mozperftest/test/androidlog.py b/python/mozperftest/mozperftest/test/androidlog.py index a9fdec51a974..7f5a91345e7b 100644 --- a/python/mozperftest/mozperftest/test/androidlog.py +++ b/python/mozperftest/mozperftest/test/androidlog.py @@ -6,7 +6,8 @@ from mozperftest.layers import Layer class AndroidLog(Layer): - """Runs an android log test.""" + """Runs an android log test. + """ name = "androidlog" activated = False diff --git a/python/mozperftest/mozperftest/test/browsertime/runner.py b/python/mozperftest/mozperftest/test/browsertime/runner.py index b7fcf8b042d0..54a70caa2ca3 100644 --- a/python/mozperftest/mozperftest/test/browsertime/runner.py +++ b/python/mozperftest/mozperftest/test/browsertime/runner.py @@ -47,7 +47,8 @@ class NodeException(Exception): class BrowsertimeRunner(NodeRunner): - """Runs a browsertime test.""" + """Runs a browsertime test. + """ name = "browsertime" activated = True @@ -133,7 +134,8 @@ class BrowsertimeRunner(NodeRunner): return path def setup(self): - """Install browsertime and visualmetrics.py prerequisites and the Node.js package.""" + """Install browsertime and visualmetrics.py prerequisites and the Node.js package. + """ node = self.get_arg("node") if node is not None: os.environ["NODEJS"] = node diff --git a/python/mozperftest/mozperftest/test/noderunner.py b/python/mozperftest/mozperftest/test/noderunner.py index 9141b553341c..cc6baaacb0d4 100644 --- a/python/mozperftest/mozperftest/test/noderunner.py +++ b/python/mozperftest/mozperftest/test/noderunner.py @@ -24,7 +24,8 @@ class NodeRunner(Layer): self.node_path = os.path.abspath(find_node_executable()[0]) def setup(self): - """Install the Node.js package.""" + """Install the Node.js package. + """ self.mach_cmd.activate_virtualenv() self.verify_node_install() diff --git a/python/mozperftest/mozperftest/test/xpcshell.py b/python/mozperftest/mozperftest/test/xpcshell.py index a22b8bc33d18..a169fa97b304 100644 --- a/python/mozperftest/mozperftest/test/xpcshell.py +++ b/python/mozperftest/mozperftest/test/xpcshell.py @@ -32,7 +32,8 @@ class XPCShellData: class XPCShell(Layer): - """Runs an xpcshell test.""" + """Runs an xpcshell test. + """ name = "xpcshell" activated = True diff --git a/python/mozperftest/mozperftest/tests/test_browsertime.py b/python/mozperftest/mozperftest/tests/test_browsertime.py index 0765d2ac8c1a..deba7cb520c0 100644 --- a/python/mozperftest/mozperftest/tests/test_browsertime.py +++ b/python/mozperftest/mozperftest/tests/test_browsertime.py @@ -109,8 +109,7 @@ def test_browser_failed(*mocked): ) def test_browser_desktop(*mocked): mach_cmd, metadata, env = get_running_env( - browsertime_iterations=1, - browsertime_extra_options="one=1,two=2", + browsertime_iterations=1, browsertime_extra_options="one=1,two=2", ) browser = env.layers[TEST] env.set_arg("tests", [EXAMPLE_TEST]) diff --git a/python/mozperftest/mozperftest/utils.py b/python/mozperftest/mozperftest/utils.py index bb3b02ea0c28..80eac06fb2bc 100644 --- a/python/mozperftest/mozperftest/utils.py +++ b/python/mozperftest/mozperftest/utils.py @@ -90,7 +90,8 @@ def host_platform(): class MachLogger: - """Wrapper around the mach logger to make logging simpler.""" + """Wrapper around the mach logger to make logging simpler. + """ def __init__(self, mach_cmd): self._logger = mach_cmd.log @@ -241,7 +242,8 @@ def convert_day(day): def get_revision_namespace_url(route, day="yesterday"): - """Builds a URL to obtain all the namespaces of a given build route for a single day.""" + """Builds a URL to obtain all the namespaces of a given build route for a single day. + """ day = convert_day(day) return f"""{MULTI_REVISION_ROOT}/{route}.{day}.revision""" diff --git a/python/mozrelease/mozrelease/scriptworker_canary.py b/python/mozrelease/mozrelease/scriptworker_canary.py index 65c0e2118113..d59dfd3c704e 100644 --- a/python/mozrelease/mozrelease/scriptworker_canary.py +++ b/python/mozrelease/mozrelease/scriptworker_canary.py @@ -112,6 +112,5 @@ def push_canary(scriptworkers, addresses, ssh_key_secret): env = os.environ.copy() for task in tasks: subprocess.check_call( - base_command + [task], - env=env, + base_command + [task], env=env, ) diff --git a/taskcluster/taskgraph/test/conftest.py b/taskcluster/taskgraph/test/conftest.py index 181517892cbe..588e06da20b4 100644 --- a/taskcluster/taskgraph/test/conftest.py +++ b/taskcluster/taskgraph/test/conftest.py @@ -21,8 +21,7 @@ def patch_prefherder(request): m = MonkeyPatch() m.setattr( - "taskgraph.util.bugbug._write_perfherder_data", - lambda lower_is_better: None, + "taskgraph.util.bugbug._write_perfherder_data", lambda lower_is_better: None, ) yield m.undo() diff --git a/taskcluster/test/conftest.py b/taskcluster/test/conftest.py index c94613e68f55..e73af097d450 100644 --- a/taskcluster/test/conftest.py +++ b/taskcluster/test/conftest.py @@ -68,10 +68,7 @@ def create_tgg(responses, datadir): for url, filename in mock_requests.items(): with open(os.path.join(datadir, filename)) as fh: responses.add( - responses.GET, - url, - json=json.load(fh), - status=200, + responses.GET, url, json=json.load(fh), status=200, ) # Still allow other real requests. diff --git a/testing/condprofile/condprof/check_install.py b/testing/condprofile/condprof/check_install.py index 676addc498f8..b3c048c4939d 100644 --- a/testing/condprofile/condprof/check_install.py +++ b/testing/condprofile/condprof/check_install.py @@ -16,7 +16,8 @@ TOPDIR = os.path.join(os.path.dirname(__file__), "..") def install_reqs(): - """We install requirements one by one, with no cache, and in isolated mode.""" + """ We install requirements one by one, with no cache, and in isolated mode. + """ try: import yaml # NOQA @@ -62,7 +63,7 @@ def install_reqs(): def check(): - """Called by the runner. + """ Called by the runner. The check function will restart the app after all deps have been installed. diff --git a/testing/condprofile/condprof/client.py b/testing/condprofile/condprof/client.py index 20c0d2cccae5..c99bc40ca305 100644 --- a/testing/condprofile/condprof/client.py +++ b/testing/condprofile/condprof/client.py @@ -55,7 +55,8 @@ class RetriesError(Exception): def _check_service(url): - """Sanity check to see if we can reach the service root url.""" + """Sanity check to see if we can reach the service root url. + """ def _check(): exists, _ = check_exists(url, all_types=True) @@ -69,7 +70,8 @@ def _check_service(url): def _check_profile(profile_dir): - """Checks for prefs we need to remove or set.""" + """Checks for prefs we need to remove or set. + """ to_remove = ("gfx.blacklist.", "marionette.") def _keep_pref(name, value): diff --git a/testing/condprofile/condprof/helpers.py b/testing/condprofile/condprof/helpers.py index befe9e033187..7dba88cfc2b2 100644 --- a/testing/condprofile/condprof/helpers.py +++ b/testing/condprofile/condprof/helpers.py @@ -13,7 +13,8 @@ def is_mobile(platform): class TabSwitcher: - """Helper used to create tabs and circulate in them.""" + """ Helper used to create tabs and circulate in them. + """ def __init__(self, session, options): self.handles = None diff --git a/testing/condprofile/condprof/metadata.py b/testing/condprofile/condprof/metadata.py index fb38fe223528..1a8837e7339e 100644 --- a/testing/condprofile/condprof/metadata.py +++ b/testing/condprofile/condprof/metadata.py @@ -15,7 +15,8 @@ METADATA_NAME = "condprofile.json" class Metadata(MutableMapping): - """dict-like class that holds metadata for a profile.""" + """ dict-like class that holds metadata for a profile. + """ def __init__(self, profile_dir): self.metadata_file = os.path.join(profile_dir, METADATA_NAME) diff --git a/testing/condprofile/condprof/runner.py b/testing/condprofile/condprof/runner.py index 8eee547d969e..65d5a01fa700 100644 --- a/testing/condprofile/condprof/runner.py +++ b/testing/condprofile/condprof/runner.py @@ -130,7 +130,8 @@ class Runner: ).run(not self.visible) async def run_all(self): - """Runs the conditioned profile builders""" + """Runs the conditioned profile builders + """ if self.scenario != "all": selected_scenario = [self.scenario] else: diff --git a/tools/lint/python/black.py b/tools/lint/python/black.py index 7a78f5b44b77..cbd84996c875 100644 --- a/tools/lint/python/black.py +++ b/tools/lint/python/black.py @@ -41,9 +41,7 @@ def get_black_version(binary): """ try: output = subprocess.check_output( - [binary, "--version"], - stderr=subprocess.STDOUT, - universal_newlines=True, + [binary, "--version"], stderr=subprocess.STDOUT, universal_newlines=True, ) except subprocess.CalledProcessError as e: output = e.output diff --git a/tools/lint/python/black_requirements.in b/tools/lint/python/black_requirements.in index 52ee1d9aa18f..7c9d150acbe9 100644 --- a/tools/lint/python/black_requirements.in +++ b/tools/lint/python/black_requirements.in @@ -1 +1 @@ -black==20.8b1 +black==19.10b0 diff --git a/tools/lint/python/black_requirements.txt b/tools/lint/python/black_requirements.txt index 3183909f24c6..e5affab7689d 100644 --- a/tools/lint/python/black_requirements.txt +++ b/tools/lint/python/black_requirements.txt @@ -4,78 +4,72 @@ # # pip-compile --generate-hashes --output-file=tools/lint/python/black_requirements.txt tools/lint/python/black_requirements.in # -appdirs==1.4.4 \ - --hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \ - --hash=sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128 \ +appdirs==1.4.3 \ + --hash=sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 \ + --hash=sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e \ # via black -black==20.8b1 \ - --hash=sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea \ - --hash=sha256:70b62ef1527c950db59062cda342ea224d772abdf6adc58b86a45421bab20a6b \ +attrs==19.1.0 \ + --hash=sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79 \ + --hash=sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399 \ + # via black +black==19.10b0 \ + --hash=sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b \ + --hash=sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539 \ # via -r tools/lint/python/black_requirements.in -click==7.1.2 \ - --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \ - --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc \ +click==7.0 \ + --hash=sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13 \ + --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7 \ # via black -mypy-extensions==0.4.3 \ - --hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \ - --hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8 \ +pathspec==0.7.0 \ + --hash=sha256:163b0632d4e31cef212976cf57b43d9fd6b0bac6e67c26015d611a647d5e7424 \ + --hash=sha256:562aa70af2e0d434367d9790ad37aed893de47f1693e4201fd1d3dca15d19b96 \ # via black -pathspec==0.8.0 \ - --hash=sha256:7d91249d21749788d07a2d0f94147accd8f845507400749ea19c1ec9054a12b0 \ - --hash=sha256:da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061 \ +regex==2020.1.8 \ + --hash=sha256:07b39bf943d3d2fe63d46281d8504f8df0ff3fe4c57e13d1656737950e53e525 \ + --hash=sha256:0932941cdfb3afcbc26cc3bcf7c3f3d73d5a9b9c56955d432dbf8bbc147d4c5b \ + --hash=sha256:0e182d2f097ea8549a249040922fa2b92ae28be4be4895933e369a525ba36576 \ + --hash=sha256:10671601ee06cf4dc1bc0b4805309040bb34c9af423c12c379c83d7895622bb5 \ + --hash=sha256:23e2c2c0ff50f44877f64780b815b8fd2e003cda9ce817a7fd00dea5600c84a0 \ + --hash=sha256:26ff99c980f53b3191d8931b199b29d6787c059f2e029b2b0c694343b1708c35 \ + --hash=sha256:27429b8d74ba683484a06b260b7bb00f312e7c757792628ea251afdbf1434003 \ + --hash=sha256:3e77409b678b21a056415da3a56abfd7c3ad03da71f3051bbcdb68cf44d3c34d \ + --hash=sha256:4e8f02d3d72ca94efc8396f8036c0d3bcc812aefc28ec70f35bb888c74a25161 \ + --hash=sha256:4eae742636aec40cf7ab98171ab9400393360b97e8f9da67b1867a9ee0889b26 \ + --hash=sha256:6a6ae17bf8f2d82d1e8858a47757ce389b880083c4ff2498dba17c56e6c103b9 \ + --hash=sha256:6a6ba91b94427cd49cd27764679024b14a96874e0dc638ae6bdd4b1a3ce97be1 \ + --hash=sha256:7bcd322935377abcc79bfe5b63c44abd0b29387f267791d566bbb566edfdd146 \ + --hash=sha256:98b8ed7bb2155e2cbb8b76f627b2fd12cf4b22ab6e14873e8641f266e0fb6d8f \ + --hash=sha256:bd25bb7980917e4e70ccccd7e3b5740614f1c408a642c245019cff9d7d1b6149 \ + --hash=sha256:d0f424328f9822b0323b3b6f2e4b9c90960b24743d220763c7f07071e0778351 \ + --hash=sha256:d58e4606da2a41659c84baeb3cfa2e4c87a74cec89a1e7c56bee4b956f9d7461 \ + --hash=sha256:e3cd21cc2840ca67de0bbe4071f79f031c81418deb544ceda93ad75ca1ee9f7b \ + --hash=sha256:e6c02171d62ed6972ca8631f6f34fa3281d51db8b326ee397b9c83093a6b7242 \ + --hash=sha256:e7c7661f7276507bce416eaae22040fd91ca471b5b33c13f8ff21137ed6f248c \ + --hash=sha256:ecc6de77df3ef68fee966bb8cb4e067e84d4d1f397d0ef6fce46913663540d77 \ # via black -regex==2020.7.14 \ - --hash=sha256:0dc64ee3f33cd7899f79a8d788abfbec168410be356ed9bd30bbd3f0a23a7204 \ - --hash=sha256:1269fef3167bb52631ad4fa7dd27bf635d5a0790b8e6222065d42e91bede4162 \ - --hash=sha256:14a53646369157baa0499513f96091eb70382eb50b2c82393d17d7ec81b7b85f \ - --hash=sha256:3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb \ - --hash=sha256:46bac5ca10fb748d6c55843a931855e2727a7a22584f302dd9bb1506e69f83f6 \ - --hash=sha256:4c037fd14c5f4e308b8370b447b469ca10e69427966527edcab07f52d88388f7 \ - --hash=sha256:51178c738d559a2d1071ce0b0f56e57eb315bcf8f7d4cf127674b533e3101f88 \ - --hash=sha256:5ea81ea3dbd6767873c611687141ec7b06ed8bab43f68fad5b7be184a920dc99 \ - --hash=sha256:6961548bba529cac7c07af2fd4d527c5b91bb8fe18995fed6044ac22b3d14644 \ - --hash=sha256:75aaa27aa521a182824d89e5ab0a1d16ca207318a6b65042b046053cfc8ed07a \ - --hash=sha256:7a2dd66d2d4df34fa82c9dc85657c5e019b87932019947faece7983f2089a840 \ - --hash=sha256:8a51f2c6d1f884e98846a0a9021ff6861bdb98457879f412fdc2b42d14494067 \ - --hash=sha256:9c568495e35599625f7b999774e29e8d6b01a6fb684d77dee1f56d41b11b40cd \ - --hash=sha256:9eddaafb3c48e0900690c1727fba226c4804b8e6127ea409689c3bb492d06de4 \ - --hash=sha256:bbb332d45b32df41200380fff14712cb6093b61bd142272a10b16778c418e98e \ - --hash=sha256:bc3d98f621898b4a9bc7fecc00513eec8f40b5b83913d74ccb445f037d58cd89 \ - --hash=sha256:c11d6033115dc4887c456565303f540c44197f4fc1a2bfb192224a301534888e \ - --hash=sha256:c50a724d136ec10d920661f1442e4a8b010a4fe5aebd65e0c2241ea41dbe93dc \ - --hash=sha256:d0a5095d52b90ff38592bbdc2644f17c6d495762edf47d876049cfd2968fbccf \ - --hash=sha256:d6cff2276e502b86a25fd10c2a96973fdb45c7a977dca2138d661417f3728341 \ - --hash=sha256:e46d13f38cfcbb79bfdb2964b0fe12561fe633caf964a77a5f8d4e45fe5d2ef7 \ +toml==0.10.0 \ + --hash=sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c \ + --hash=sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e \ # via black -toml==0.10.1 \ - --hash=sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f \ - --hash=sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88 \ - # via black -typed-ast==1.4.1 \ - --hash=sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355 \ - --hash=sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919 \ - --hash=sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa \ - --hash=sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652 \ - --hash=sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75 \ - --hash=sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01 \ - --hash=sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d \ - --hash=sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1 \ - --hash=sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907 \ - --hash=sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c \ - --hash=sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3 \ - --hash=sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b \ - --hash=sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614 \ - --hash=sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb \ - --hash=sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b \ - --hash=sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41 \ - --hash=sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6 \ - --hash=sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34 \ - --hash=sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe \ - --hash=sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4 \ - --hash=sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7 \ - # via black -typing-extensions==3.7.4.3 \ - --hash=sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918 \ - --hash=sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c \ - --hash=sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f \ +typed-ast==1.4.0 \ + --hash=sha256:1170afa46a3799e18b4c977777ce137bb53c7485379d9706af8a59f2ea1aa161 \ + --hash=sha256:18511a0b3e7922276346bcb47e2ef9f38fb90fd31cb9223eed42c85d1312344e \ + --hash=sha256:262c247a82d005e43b5b7f69aff746370538e176131c32dda9cb0f324d27141e \ + --hash=sha256:2b907eb046d049bcd9892e3076c7a6456c93a25bebfe554e931620c90e6a25b0 \ + --hash=sha256:354c16e5babd09f5cb0ee000d54cfa38401d8b8891eefa878ac772f827181a3c \ + --hash=sha256:48e5b1e71f25cfdef98b013263a88d7145879fbb2d5185f2a0c79fa7ebbeae47 \ + --hash=sha256:4e0b70c6fc4d010f8107726af5fd37921b666f5b31d9331f0bd24ad9a088e631 \ + --hash=sha256:630968c5cdee51a11c05a30453f8cd65e0cc1d2ad0d9192819df9978984529f4 \ + --hash=sha256:66480f95b8167c9c5c5c87f32cf437d585937970f3fc24386f313a4c97b44e34 \ + --hash=sha256:71211d26ffd12d63a83e079ff258ac9d56a1376a25bc80b1cdcdf601b855b90b \ + --hash=sha256:7954560051331d003b4e2b3eb822d9dd2e376fa4f6d98fee32f452f52dd6ebb2 \ + --hash=sha256:838997f4310012cf2e1ad3803bce2f3402e9ffb71ded61b5ee22617b3a7f6b6e \ + --hash=sha256:95bd11af7eafc16e829af2d3df510cecfd4387f6453355188342c3e79a2ec87a \ + --hash=sha256:bc6c7d3fa1325a0c6613512a093bc2a2a15aeec350451cbdf9e1d4bffe3e3233 \ + --hash=sha256:cc34a6f5b426748a507dd5d1de4c1978f2eb5626d51326e43280941206c209e1 \ + --hash=sha256:d755f03c1e4a51e9b24d899561fec4ccaf51f210d52abdf8c07ee2849b212a36 \ + --hash=sha256:d7c45933b1bdfaf9f36c579671fec15d25b06c8398f113dab64c18ed1adda01d \ + --hash=sha256:d896919306dd0aa22d0132f62a1b78d11aaf4c9fc5b3410d3c666b818191630a \ + --hash=sha256:fdc1c9bbf79510b76408840e009ed65958feba92a88833cdceecff93ae8fff66 \ + --hash=sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12 \ # via black diff --git a/tools/lint/rust/__init__.py b/tools/lint/rust/__init__.py index 60135adcab9b..13bf44bc4126 100644 --- a/tools/lint/rust/__init__.py +++ b/tools/lint/rust/__init__.py @@ -117,9 +117,7 @@ def get_rustfmt_version(binary): """ try: output = subprocess.check_output( - [binary, "--version"], - stderr=subprocess.STDOUT, - universal_newlines=True, + [binary, "--version"], stderr=subprocess.STDOUT, universal_newlines=True, ) except subprocess.CalledProcessError as e: output = e.output diff --git a/tools/moztreedocs/mach_commands.py b/tools/moztreedocs/mach_commands.py index 79d3ba2bc299..186b3d94082c 100644 --- a/tools/moztreedocs/mach_commands.py +++ b/tools/moztreedocs/mach_commands.py @@ -215,9 +215,9 @@ class Documentation(MachCommandBase): def _dump_sphinx_backtrace(self): """ - If there is a sphinx dump file, read and return - its content. - By default, it isn't displayed. + If there is a sphinx dump file, read and return + its content. + By default, it isn't displayed. """ pattern = "sphinx-err-*" output = "" @@ -263,7 +263,7 @@ class Documentation(MachCommandBase): def _post_process_html(self, savedir): """ - Perform some operations on the generated html to fix some URL + Perform some operations on the generated html to fix some URL """ MERMAID_VERSION = "8.4.4" for root, _, files in os.walk(savedir): diff --git a/tools/moztreedocs/upload.py b/tools/moztreedocs/upload.py index d827537e69d1..72769652cb3d 100644 --- a/tools/moztreedocs/upload.py +++ b/tools/moztreedocs/upload.py @@ -91,8 +91,7 @@ def s3_set_redirects(redirects): configuration["RoutingRules"].append(rule) s3.put_bucket_website( - Bucket=bucket, - WebsiteConfiguration=configuration, + Bucket=bucket, WebsiteConfiguration=configuration, ) @@ -121,10 +120,7 @@ def s3_delete_missing(files, key_prefix=None): while files_to_delete: keys_to_remove = [{"Key": key} for key in files_to_delete[:query_size]] response = s3.delete_objects( - Bucket=bucket, - Delete={ - "Objects": keys_to_remove, - }, # NOQA + Bucket=bucket, Delete={"Objects": keys_to_remove,}, # NOQA ) pprint(response, indent=2) files_to_delete = files_to_delete[query_size:]