Run black and cleanup_deps.py
Change-Id: I48f78691f141c256a2d4e1c010ab2fcb76866675
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/98420
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/recipe_modules/pw_presubmit/tests/full.py b/recipe_modules/pw_presubmit/tests/full.py
index a590c16..da3bf0e 100644
--- a/recipe_modules/pw_presubmit/tests/full.py
+++ b/recipe_modules/pw_presubmit/tests/full.py
@@ -97,7 +97,7 @@
+ properties(step=['step1', 'step2'])
+ api.checkout.try_test_data(
start_time=datetime.datetime.utcfromtimestamp(1600000000),
- execution_timeout=3*60*60,
+ execution_timeout=3 * 60 * 60,
)
+ api.time.seed(1600000000)
+ api.time.step(20.0)
@@ -108,7 +108,7 @@
+ properties(step=['step1', 'step2'])
+ api.checkout.try_test_data(
start_time=datetime.datetime.utcfromtimestamp(1600000000),
- execution_timeout=30*60,
+ execution_timeout=30 * 60,
)
+ api.time.seed(1600000000)
+ api.time.step(20.0)
diff --git a/recipes/cipd_roller.py b/recipes/cipd_roller.py
index 016111d..ff20f04 100644
--- a/recipes/cipd_roller.py
+++ b/recipes/cipd_roller.py
@@ -300,8 +300,7 @@
return api.step_data(
'find shared tag.cipd describe {}'.format(package_paths[1]),
api.cipd.example_describe(
- package_paths[1],
- test_data_tags=['{}:{}'.format(tagname, 0)],
+ package_paths[1], test_data_tags=['{}:{}'.format(tagname, 0)],
),
)
diff --git a/recipes/multiple_submodule_roller.py b/recipes/multiple_submodule_roller.py
index ac43408..b5e6f14 100644
--- a/recipes/multiple_submodule_roller.py
+++ b/recipes/multiple_submodule_roller.py
@@ -137,8 +137,7 @@
submodule.branch = 'main'
submodule.remote = api.roll_util.normalize_remote(
- parser.get(section, 'url'),
- checkout.options.remote,
+ parser.get(section, 'url'), checkout.options.remote,
)
change = _update_submodule(
@@ -268,9 +267,7 @@
yield (
api.status_check.test('success')
+ properties(
- submodules('a1', 'b2'),
- cc_authors_on_rolls=True,
- always_cc=True,
+ submodules('a1', 'b2'), cc_authors_on_rolls=True, always_cc=True,
)
+ commit_data('a1', prefix='')
+ commit_data('b2', prefix='')
diff --git a/recipes/submodule_roller.py b/recipes/submodule_roller.py
index 7330d31..eeaabef 100644
--- a/recipes/submodule_roller.py
+++ b/recipes/submodule_roller.py
@@ -176,9 +176,7 @@
else:
api.roll_util.skip_roll_step(
- dep.remote,
- old_revision,
- dep.commit,
+ dep.remote, old_revision, dep.commit,
)
pres.step_summary_text = 'already applied'
@@ -253,8 +251,7 @@
submodule_dir = checkout.root.join(submodule_path)
remote = api.roll_util.normalize_remote(
- parser.get(section, 'url'),
- checkout.options.remote,
+ parser.get(section, 'url'), checkout.options.remote,
)
# If this was triggered by a gitiles poller, check that the triggering
@@ -436,13 +433,10 @@
yield (
api.status_check.test(
- 'relative-dotdot-dotdot-always-cc-reviewers',
- status='failure',
+ 'relative-dotdot-dotdot-always-cc-reviewers', status='failure',
)
+ properties(
- submodule_path='a1',
- cc_reviewers_on_rolls=True,
- always_cc=True,
+ submodule_path='a1', cc_reviewers_on_rolls=True, always_cc=True,
)
+ trigger('https://pigweed.googlesource.com/a1')
+ commit_data('a1', prefix='')
@@ -559,13 +553,10 @@
prefix='',
)
+ api.cq_deps.details(
- 'foo:2000',
- message='Requires: {}'.format(','.join(requires)),
+ 'foo:2000', message='Requires: {}'.format(','.join(requires)),
)
+ api.roll_util.commit_data(
- 'spam',
- api.roll_util.commit('2' * 40),
- prefix='',
+ 'spam', api.roll_util.commit('2' * 40), prefix='',
)
+ api.roll_util.forward_roll()
)
@@ -575,9 +566,7 @@
requires_test('with-requires', 'foo:444')
+ api.cq_deps.details('foo:444', status='MERGED', project='ham')
+ api.roll_util.commit_data(
- 'ham',
- api.roll_util.commit('2' * 40),
- prefix='applying foo:444.',
+ 'ham', api.roll_util.commit('2' * 40), prefix='applying foo:444.',
)
+ api.roll_util.forward_roll('applying foo:444.')
+ api.auto_roller.dry_run_success()
@@ -602,9 +591,7 @@
yield (
requires_test('with-requires-not-in-checkout', 'foo:444')
+ api.cq_deps.details(
- 'foo:444',
- status='MERGED',
- project='not-in-this-checkout',
+ 'foo:444', status='MERGED', project='not-in-this-checkout',
)
+ api.auto_roller.dry_run_success()
)
@@ -619,16 +606,12 @@
message='Requires: foo:555',
)
+ api.roll_util.commit_data(
- 'ham',
- api.roll_util.commit('2' * 40),
- prefix='applying foo:444.',
+ 'ham', api.roll_util.commit('2' * 40), prefix='applying foo:444.',
)
+ api.roll_util.forward_roll('applying foo:444.')
+ api.cq_deps.details('foo:555', status='MERGED', project='eggs')
+ api.roll_util.commit_data(
- 'eggs',
- api.roll_util.commit('2' * 40),
- prefix='applying foo:555.',
+ 'eggs', api.roll_util.commit('2' * 40), prefix='applying foo:555.',
)
+ api.roll_util.forward_roll('applying foo:555.')
+ api.auto_roller.dry_run_success()
@@ -644,9 +627,7 @@
message='Requires: foo:2000',
)
+ api.roll_util.commit_data(
- 'ham',
- api.roll_util.commit('2' * 40),
- prefix='applying foo:444.',
+ 'ham', api.roll_util.commit('2' * 40), prefix='applying foo:444.',
)
+ api.roll_util.forward_roll('applying foo:444.')
+ api.auto_roller.dry_run_success()
@@ -657,22 +638,14 @@
def parent_child_test(*args, **kwargs):
return (
requires_test(*args, **kwargs)
- + api.cq_deps.details(
- 'foo:444',
- status='MERGED',
- project='ham',
- )
+ + api.cq_deps.details('foo:444', status='MERGED', project='ham',)
+ api.roll_util.commit_data(
'ham',
api.roll_util.commit('4' * 40),
prefix='applying foo:444.',
)
+ api.roll_util.forward_roll('applying foo:444.')
- + api.cq_deps.details(
- 'foo:555',
- status='MERGED',
- project='ham',
- )
+ + api.cq_deps.details('foo:555', status='MERGED', project='ham',)
)
# CL 2000 requires CL 444 in ham and CL 555 in ham, both of which are
@@ -681,9 +654,7 @@
parent_child_test('with-requires-child', 'foo:444', 'foo:555')
+ api.roll_util.forward_roll('applying foo:555.')
+ api.roll_util.commit_data(
- 'ham',
- api.roll_util.commit('5' * 40),
- prefix='applying foo:555.',
+ 'ham', api.roll_util.commit('5' * 40), prefix='applying foo:555.',
)
+ api.auto_roller.dry_run_success()
)
diff --git a/recipes/target_to_git.py b/recipes/target_to_git.py
index dadb80e..776710e 100644
--- a/recipes/target_to_git.py
+++ b/recipes/target_to_git.py
@@ -22,7 +22,6 @@
DEPS = [
'fuchsia/auto_roller',
- 'fuchsia/gerrit',
'fuchsia/git',
'fuchsia/status_check',
'pigweed/build',
diff --git a/recipes/txt_roller.py b/recipes/txt_roller.py
index 5d6ad18..1fc1a88 100644
--- a/recipes/txt_roller.py
+++ b/recipes/txt_roller.py
@@ -83,9 +83,7 @@
project_checkout = api.checkout(
CheckoutOptions(
- remote=project_remote,
- branch=project_branch,
- use_trigger=True,
+ remote=project_remote, branch=project_branch, use_trigger=True,
),
root=project_dir,
)
@@ -100,9 +98,7 @@
full_txt_path = checkout.root.join(txt_path)
old_revision = api.file.read_text(
- 'read old revision',
- full_txt_path,
- test_data='1' * 40,
+ 'read old revision', full_txt_path, test_data='1' * 40,
).strip()
api.file.write_text('write new revision', full_txt_path, new_revision)
diff --git a/recipes/update_python_versions.py b/recipes/update_python_versions.py
index b222e2b..743e8c2 100644
--- a/recipes/update_python_versions.py
+++ b/recipes/update_python_versions.py
@@ -20,7 +20,6 @@
DEPS = [
'fuchsia/auto_roller',
- 'fuchsia/gerrit',
'fuchsia/status_check',
'pigweed/build',
'pigweed/checkout',
@@ -38,9 +37,7 @@
def RunSteps(api, props): # pylint: disable=invalid-name
checkout = api.checkout(props.checkout_options)
env = api.environment.init(
- checkout.root,
- props.environment_options,
- use_constraint_file=False,
+ checkout.root, props.environment_options, use_constraint_file=False,
)
with env():
