Merge ~cjwatson/launchpad:black-oci into launchpad:master

[Colin Watson]

lp.oci: Apply black

[Colin Watson (cjwatson)]

Self-approving based on previous discussions. I've run the `lp.oci` tests.

review: Approve

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f667459..1166ab6 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -76,3 +76,5 @@ a6bed71f3d2fdbceae20c2d435c993e8bededdce
 ed7d7b97b8fb4ebe92799f922b0fa9c4bd1714e8
 # apply black to lp.coop
 1e6ead9387a1d073eea9271fe8dc646bb22fa3d2
+# apply black to lp.oci
+06b1048510a0b65bb0a6fc46d4e063510b52b5f6
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a7d8233..43f0476 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -52,6 +52,7 @@ repos:
             |code
             |codehosting
             |coop
+            |oci
           )/
 -   repo: https://github.com/PyCQA/isort
     rev: 5.9.2
@@ -80,6 +81,7 @@ repos:
             |code
             |codehosting
             |coop
+            |oci
           )/
     -   id: isort
         alias: isort-black
@@ -98,6 +100,7 @@ repos:
             |code
             |codehosting
             |coop
+            |oci
           )/
 -   repo: https://github.com/PyCQA/flake8
     rev: 3.9.2
diff --git a/lib/lp/oci/browser/hasocirecipes.py b/lib/lp/oci/browser/hasocirecipes.py
index a32ff79..efb92aa 100644
--- a/lib/lp/oci/browser/hasocirecipes.py
+++ b/lib/lp/oci/browser/hasocirecipes.py
@@ -4,8 +4,8 @@
 """Mixins for browser classes for objects related to OCI recipe."""
 
 __all__ = [
-    'HasOCIRecipesMenuMixin',
-    ]
+    "HasOCIRecipesMenuMixin",
+]
 
 from zope.component import getUtility
 
@@ -17,8 +17,11 @@ class HasOCIRecipesMenuMixin:
     """A mixin for context menus for objects that has OCI recipes."""
 
     def view_oci_recipes(self):
-        target = '+oci-recipes'
-        text = 'View OCI recipes'
-        enabled = not getUtility(IOCIRecipeSet).findByContext(
-            self.context, visible_by_user=self.user).is_empty()
-        return Link(target, text, enabled=enabled, icon='info')
+        target = "+oci-recipes"
+        text = "View OCI recipes"
+        enabled = (
+            not getUtility(IOCIRecipeSet)
+            .findByContext(self.context, visible_by_user=self.user)
+            .is_empty()
+        )
+        return Link(target, text, enabled=enabled, icon="info")
diff --git a/lib/lp/oci/browser/ocirecipe.py b/lib/lp/oci/browser/ocirecipe.py
index 7329652..0b9f4d2 100644
--- a/lib/lp/oci/browser/ocirecipe.py
+++ b/lib/lp/oci/browser/ocirecipe.py
@@ -4,22 +4,19 @@
 """OCI recipe views."""
 
 __all__ = [
-    'OCIRecipeAddView',
-    'OCIRecipeAdminView',
-    'OCIRecipeContextMenu',
-    'OCIRecipeDeleteView',
-    'OCIRecipeEditPushRulesView',
-    'OCIRecipeEditView',
-    'OCIRecipeNavigation',
-    'OCIRecipeNavigationMenu',
-    'OCIRecipeRequestBuildsView',
-    'OCIRecipeView',
-    ]
-
-from lazr.restful.interface import (
-    copy_field,
-    use_template,
-    )
+    "OCIRecipeAddView",
+    "OCIRecipeAdminView",
+    "OCIRecipeContextMenu",
+    "OCIRecipeDeleteView",
+    "OCIRecipeEditPushRulesView",
+    "OCIRecipeEditView",
+    "OCIRecipeNavigation",
+    "OCIRecipeNavigationMenu",
+    "OCIRecipeRequestBuildsView",
+    "OCIRecipeView",
+]
+
+from lazr.restful.interface import copy_field, use_template
 from zope.component import getUtility
 from zope.formlib.form import FormFields
 from zope.formlib.textwidgets import TextAreaWidget
@@ -27,7 +24,7 @@ from zope.formlib.widget import (
     CustomWidgetFactory,
     DisplayWidget,
     renderElement,
-    )
+)
 from zope.interface import Interface
 from zope.schema import (
     Bool,
@@ -37,66 +34,63 @@ from zope.schema import (
     Text,
     TextLine,
     ValidationError,
-    )
+)
 from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
 
 from lp.app.browser.launchpadform import (
-    action,
     LaunchpadEditFormView,
     LaunchpadFormView,
-    )
+    action,
+)
 from lp.app.browser.lazrjs import InlinePersonEditPickerWidget
-from lp.app.browser.tales import (
-    format_link,
-    GitRepositoryFormatterAPI,
-    )
+from lp.app.browser.tales import GitRepositoryFormatterAPI, format_link
 from lp.app.errors import UnexpectedFormData
 from lp.app.validators.validation import validate_oci_branch_name
 from lp.app.vocabularies import InformationTypeVocabulary
 from lp.app.widgets.itemswidgets import (
     LabeledMultiCheckBoxWidget,
     LaunchpadRadioWidgetWithDescription,
-    )
+)
 from lp.buildmaster.interfaces.processor import IProcessorSet
 from lp.code.browser.widgets.gitref import GitRefWidget
 from lp.code.interfaces.gitrepository import IGitRepositorySet
 from lp.oci.interfaces.ocipushrule import (
     IOCIPushRuleSet,
     OCIPushRuleAlreadyExists,
-    )
+)
 from lp.oci.interfaces.ocirecipe import (
+    OCI_RECIPE_ALLOW_CREATE,
+    OCI_RECIPE_WEBHOOKS_FEATURE_FLAG,
     IOCIRecipe,
     IOCIRecipeSet,
     NoSuchOCIRecipe,
-    OCI_RECIPE_ALLOW_CREATE,
-    OCI_RECIPE_WEBHOOKS_FEATURE_FLAG,
     OCIRecipeFeatureDisabled,
-    )
+)
 from lp.oci.interfaces.ocirecipebuild import (
     IOCIRecipeBuildSet,
     OCIRecipeBuildRegistryUploadStatus,
-    )
+)
 from lp.oci.interfaces.ocirecipejob import IOCIRecipeRequestBuildsJobSource
 from lp.oci.interfaces.ociregistrycredentials import (
     IOCIRegistryCredentialsSet,
     OCIRegistryCredentialsAlreadyExist,
     user_can_edit_credentials_for_owner,
-    )
+)
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.features import getFeatureFlag
 from lp.services.propertycache import cachedproperty
 from lp.services.webapp import (
-    canonical_url,
     ContextMenu,
-    enabled_with_permission,
     LaunchpadView,
     Link,
     Navigation,
     NavigationMenu,
+    canonical_url,
+    enabled_with_permission,
     stepthrough,
     structured,
-    )
+)
 from lp.services.webapp.authorization import check_permission
 from lp.services.webapp.batching import BatchNavigator
 from lp.services.webapp.breadcrumb import NameBreadcrumb
@@ -110,7 +104,7 @@ class OCIRecipeNavigation(WebhookTargetNavigationMixin, Navigation):
 
     usedfor = IOCIRecipe
 
-    @stepthrough('+build-request')
+    @stepthrough("+build-request")
     def traverse_build_request(self, name):
         try:
             job_id = int(name)
@@ -118,14 +112,14 @@ class OCIRecipeNavigation(WebhookTargetNavigationMixin, Navigation):
             return None
         return self.context.getBuildRequest(job_id)
 
-    @stepthrough('+build')
+    @stepthrough("+build")
     def traverse_build(self, name):
         build = get_build_by_id_str(IOCIRecipeBuildSet, name)
         if build is None or build.recipe != self.context:
             return None
         return build
 
-    @stepthrough('+push-rule')
+    @stepthrough("+push-rule")
     def traverse_pushrule(self, id):
         id = int(id)
         return getUtility(IOCIPushRuleSet).getByID(id)
@@ -139,7 +133,6 @@ class OCIRecipeNavigation(WebhookTargetNavigationMixin, Navigation):
 
 
 class OCIRecipeBreadcrumb(NameBreadcrumb):
-
     @property
     def inside(self):
         return self.context.oci_project
@@ -162,11 +155,14 @@ class OCIRecipeNavigationMenu(NavigationMenu):
     def edit(self):
         return Link("+edit", "Edit OCI recipe", icon="edit")
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission("launchpad.Edit")
     def webhooks(self):
         return Link(
-            '+webhooks', 'Manage webhooks', icon='edit',
-            enabled=bool(getFeatureFlag(OCI_RECIPE_WEBHOOKS_FEATURE_FLAG)))
+            "+webhooks",
+            "Manage webhooks",
+            icon="edit",
+            enabled=bool(getFeatureFlag(OCI_RECIPE_WEBHOOKS_FEATURE_FLAG)),
+        )
 
     @enabled_with_permission("launchpad.Edit")
     def delete(self):
@@ -178,19 +174,22 @@ class OCIRecipeContextMenu(ContextMenu):
 
     usedfor = IOCIRecipe
 
-    facet = 'overview'
+    facet = "overview"
 
-    links = ('request_builds', 'edit_push_rules',
-             'add_subscriber', 'subscription')
+    links = (
+        "request_builds",
+        "edit_push_rules",
+        "add_subscriber",
+        "subscription",
+    )
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission("launchpad.Edit")
     def request_builds(self):
-        return Link('+request-builds', 'Request builds', icon='add')
+        return Link("+request-builds", "Request builds", icon="add")
 
-    @enabled_with_permission('launchpad.Edit')
+    @enabled_with_permission("launchpad.Edit")
     def edit_push_rules(self):
-        return Link(
-            '+edit-push-rules', 'Edit push rules', icon='edit')
+        return Link("+edit-push-rules", "Edit push rules", icon="edit")
 
     @enabled_with_permission("launchpad.AnyPerson")
     def subscription(self):
@@ -214,11 +213,12 @@ class OCIRecipeListingView(LaunchpadView):
     """Default view for the list of OCI recipes of a context (OCI project
     or Person).
     """
-    page_title = 'Recipes'
+
+    page_title = "Recipes"
 
     @property
     def label(self):
-        return 'OCI recipes for %s' % self.context.name
+        return "OCI recipes for %s" % self.context.name
 
     @property
     def title(self):
@@ -227,8 +227,9 @@ class OCIRecipeListingView(LaunchpadView):
     @property
     def recipes(self):
         recipes = getUtility(IOCIRecipeSet).findByContext(
-            self.context, visible_by_user=self.user)
-        return recipes.order_by('name')
+            self.context, visible_by_user=self.user
+        )
+        return recipes.order_by("name")
 
     @property
     def recipes_navigator(self):
@@ -266,8 +267,7 @@ class OCIRecipeView(LaunchpadView):
         # We're still not sure how this plays into
         # plans for internal registry announcements and such, so we
         # land redaction first and think about this later.
-        return list(
-            getUtility(IOCIPushRuleSet).findByRecipe(self.context))
+        return list(getUtility(IOCIPushRuleSet).findByRecipe(self.context))
 
     @property
     def has_push_rules(self):
@@ -284,10 +284,15 @@ class OCIRecipeView(LaunchpadView):
     def person_picker(self):
         field = copy_field(
             IOCIRecipe["owner"],
-            vocabularyName="AllUserTeamsParticipationPlusSelfSimpleDisplay")
+            vocabularyName="AllUserTeamsParticipationPlusSelfSimpleDisplay",
+        )
         return InlinePersonEditPickerWidget(
-            self.context, field, format_link(self.context.owner),
-            header="Change owner", step_title="Select a new owner")
+            self.context,
+            field,
+            format_link(self.context.owner),
+            header="Change owner",
+            step_title="Select a new owner",
+        )
 
     @property
     def build_frequency(self):
@@ -300,11 +305,12 @@ class OCIRecipeView(LaunchpadView):
     def build_args(self):
         return "\n".join(
             "%s=%s" % (k, v)
-            for k, v in sorted(self.context.build_args.items()))
+            for k, v in sorted(self.context.build_args.items())
+        )
 
     @property
     def distribution_has_credentials(self):
-        if hasattr(self.context, 'oci_project'):
+        if hasattr(self.context, "oci_project"):
             oci_project = self.context.oci_project
         else:
             oci_project = self.context
@@ -313,13 +319,12 @@ class OCIRecipeView(LaunchpadView):
 
     def getImageForStatus(self, status):
         image_map = {
-            BuildSetStatus.NEEDSBUILD: '/@@/build-needed',
-            BuildSetStatus.FULLYBUILT_PENDING: '/@@/build-success-publishing',
-            BuildSetStatus.FAILEDTOBUILD: '/@@/no',
-            BuildSetStatus.BUILDING: '/@@/processing',
-            }
-        return image_map.get(
-            status, '/@@/yes')
+            BuildSetStatus.NEEDSBUILD: "/@@/build-needed",
+            BuildSetStatus.FULLYBUILT_PENDING: "/@@/build-success-publishing",
+            BuildSetStatus.FAILEDTOBUILD: "/@@/no",
+            BuildSetStatus.BUILDING: "/@@/processing",
+        }
+        return image_map.get(status, "/@@/yes")
 
     def _convertBuildJobToStatus(self, build_job):
         recipe_set = getUtility(IOCIRecipeSet)
@@ -327,7 +332,8 @@ class OCIRecipeView(LaunchpadView):
         upload_status = build_job.registry_upload_status
         # This is just a dict, but zope wraps it as RecipeSet is secured
         status = removeSecurityProxy(
-                    recipe_set.getStatusSummaryForBuilds([build_job]))
+            recipe_set.getStatusSummaryForBuilds([build_job])
+        )
         # Add the registry job status
         status["upload_requested"] = upload_status != unscheduled_upload
         status["upload"] = upload_status
@@ -338,7 +344,7 @@ class OCIRecipeView(LaunchpadView):
             "job_id": "build{}".format(build_job.id),
             "date_created": build_job.date_created,
             "date_finished": build_job.date_finished,
-            "build_status": status
+            "build_status": status,
         }
 
     def build_requests(self):
@@ -352,7 +358,7 @@ class OCIRecipeView(LaunchpadView):
         if len(build_requests) < 10:
             recipe = self.context
             no_request_builds = recipe.completed_builds_without_build_request
-            for build in no_request_builds[:10 - len(build_requests)]:
+            for build in no_request_builds[: 10 - len(build_requests)]:
                 build_requests.append(self._convertBuildJobToStatus(build))
         return build_requests[:10]
 
@@ -372,7 +378,7 @@ def builds_for_recipe(recipe):
     """
     builds = list(recipe.pending_builds)
     if len(builds) < 10:
-        builds.extend(recipe.completed_builds[:10 - len(builds)])
+        builds.extend(recipe.completed_builds[: 10 - len(builds)])
     return builds
 
 
@@ -408,8 +414,7 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
 
     @cachedproperty
     def push_rules(self):
-        return list(
-            getUtility(IOCIPushRuleSet).findByRecipe(self.context))
+        return list(getUtility(IOCIPushRuleSet).findByRecipe(self.context))
 
     @property
     def has_push_rules(self):
@@ -418,7 +423,8 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
     @cachedproperty
     def can_edit_credentials(self):
         return user_can_edit_credentials_for_owner(
-            self.context.owner, self.user)
+            self.context.owner, self.user
+        )
 
     def _getFieldName(self, name, rule_id):
         """Get the combined field name for an `OCIPushRule` ID.
@@ -437,13 +443,15 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
         field_bits = field_name.split(".")
         if len(field_bits) != 2:
             raise UnexpectedFormData(
-                "Cannot parse field name: %s" % field_name)
+                "Cannot parse field name: %s" % field_name
+            )
         field_type = field_bits[0]
         try:
             rule_id = int(field_bits[1])
         except ValueError:
             raise UnexpectedFormData(
-                "Cannot parse field name: %s" % field_name)
+                "Cannot parse field name: %s" % field_name
+            )
         return field_type, rule_id
 
     def setUpFields(self):
@@ -460,26 +468,38 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
         for elem in list(self.context.push_rules):
             image_name_fields.append(
                 TextLine(
-                    __name__=self._getFieldName('image_name', elem.id),
+                    __name__=self._getFieldName("image_name", elem.id),
                     default=elem.image_name,
-                    required=True, readonly=False))
-            if check_permission('launchpad.View', elem.registry_credentials):
+                    required=True,
+                    readonly=False,
+                )
+            )
+            if check_permission("launchpad.View", elem.registry_credentials):
                 url_fields.append(
                     TextLine(
-                        __name__=self._getFieldName('url', elem.id),
+                        __name__=self._getFieldName("url", elem.id),
                         default=elem.registry_credentials.url,
-                        required=True, readonly=True))
+                        required=True,
+                        readonly=True,
+                    )
+                )
                 region = elem.registry_credentials.region
                 region_fields.append(
                     TextLine(
-                        __name__=self._getFieldName('region', elem.id),
+                        __name__=self._getFieldName("region", elem.id),
                         default=region,
-                        required=False, readonly=True))
+                        required=False,
+                        readonly=True,
+                    )
+                )
                 username_fields.append(
                     TextLine(
-                        __name__=self._getFieldName('username', elem.id),
+                        __name__=self._getFieldName("username", elem.id),
                         default=elem.registry_credentials.username,
-                        required=True, readonly=True))
+                        required=True,
+                        readonly=True,
+                    )
+                )
             else:
                 # XXX cjwatson 2020-08-27: Ideally we'd be able to just show
                 # the URL, and maybe the username too, but the
@@ -492,71 +512,89 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
                 # viewer's recipes.
                 private_url_fields.append(
                     TextLine(
-                        __name__=self._getFieldName('url', elem.id),
-                        default='', required=True, readonly=True))
+                        __name__=self._getFieldName("url", elem.id),
+                        default="",
+                        required=True,
+                        readonly=True,
+                    )
+                )
                 private_region_fields.append(
                     TextLine(
-                        __name__=self._getFieldName('region', elem.id),
-                        default='', required=False, readonly=True))
+                        __name__=self._getFieldName("region", elem.id),
+                        default="",
+                        required=False,
+                        readonly=True,
+                    )
+                )
                 private_username_fields.append(
                     TextLine(
-                        __name__=self._getFieldName('username', elem.id),
-                        default='', required=True, readonly=True))
+                        __name__=self._getFieldName("username", elem.id),
+                        default="",
+                        required=True,
+                        readonly=True,
+                    )
+                )
             delete_fields.append(
                 Bool(
-                    __name__=self._getFieldName('delete', elem.id),
+                    __name__=self._getFieldName("delete", elem.id),
                     default=False,
-                    required=True, readonly=False))
+                    required=True,
+                    readonly=False,
+                )
+            )
         image_name_fields.append(
-            TextLine(
-                __name__='add_image_name',
-                required=False, readonly=False))
+            TextLine(__name__="add_image_name", required=False, readonly=False)
+        )
         add_credentials = Choice(
-            __name__='add_credentials',
-            default='existing', values=('existing', 'new'),
-            required=False, readonly=False)
+            __name__="add_credentials",
+            default="existing",
+            values=("existing", "new"),
+            required=False,
+            readonly=False,
+        )
         existing_credentials = Choice(
-            vocabulary='OCIRegistryCredentials',
+            vocabulary="OCIRegistryCredentials",
             required=False,
-            __name__='existing_credentials')
+            __name__="existing_credentials",
+        )
         url_fields.append(
-            TextLine(
-                __name__='add_url',
-                required=False, readonly=False))
+            TextLine(__name__="add_url", required=False, readonly=False)
+        )
         region_fields.append(
-            TextLine(
-                __name__='add_region',
-                required=False, readonly=False))
+            TextLine(__name__="add_region", required=False, readonly=False)
+        )
         username_fields.append(
-            TextLine(
-                __name__='add_username',
-                required=False, readonly=False))
+            TextLine(__name__="add_username", required=False, readonly=False)
+        )
         password_fields.append(
-            Password(
-                __name__='add_password',
-                required=False, readonly=False))
+            Password(__name__="add_password", required=False, readonly=False)
+        )
         password_fields.append(
             Password(
-                __name__='add_confirm_password',
-                required=False, readonly=False))
+                __name__="add_confirm_password", required=False, readonly=False
+            )
+        )
 
         self.form_fields = (
-            FormFields(*image_name_fields) +
-            FormFields(*url_fields) +
-            FormFields(
-                *private_url_fields,
-                custom_widget=InvisibleCredentialsWidget) +
-            FormFields(*region_fields) +
-            FormFields(
+            FormFields(*image_name_fields)
+            + FormFields(*url_fields)
+            + FormFields(
+                *private_url_fields, custom_widget=InvisibleCredentialsWidget
+            )
+            + FormFields(*region_fields)
+            + FormFields(
                 *private_region_fields,
-                custom_widget=InvisibleCredentialsWidget) +
-            FormFields(*username_fields) +
-            FormFields(
+                custom_widget=InvisibleCredentialsWidget,
+            )
+            + FormFields(*username_fields)
+            + FormFields(
                 *private_username_fields,
-                custom_widget=InvisibleCredentialsWidget) +
-            FormFields(*password_fields) +
-            FormFields(*delete_fields) +
-            FormFields(add_credentials, existing_credentials))
+                custom_widget=InvisibleCredentialsWidget,
+            )
+            + FormFields(*password_fields)
+            + FormFields(*delete_fields)
+            + FormFields(add_credentials, existing_credentials)
+        )
 
     def setUpWidgets(self, context=None):
         """See `LaunchpadFormView`."""
@@ -567,9 +605,9 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
 
     @property
     def label(self):
-        return 'Edit OCI push rules for %s' % self.context.name
+        return "Edit OCI push rules for %s" % self.context.name
 
-    page_title = 'Edit OCI push rules'
+    page_title = "Edit OCI push rules"
 
     @property
     def cancel_url(self):
@@ -577,16 +615,13 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
 
     def getRuleWidgets(self, rule):
         widgets_by_name = {widget.name: widget for widget in self.widgets}
-        url_field_name = (
-                "field." + self._getFieldName("url", rule.id))
-        region_field_name = (
-                "field." + self._getFieldName("region", rule.id))
-        image_field_name = (
-                "field." + self._getFieldName("image_name", rule.id))
-        username_field_name = (
-                "field." + self._getFieldName("username", rule.id))
-        delete_field_name = (
-                "field." + self._getFieldName("delete", rule.id))
+        url_field_name = "field." + self._getFieldName("url", rule.id)
+        region_field_name = "field." + self._getFieldName("region", rule.id)
+        image_field_name = "field." + self._getFieldName("image_name", rule.id)
+        username_field_name = "field." + self._getFieldName(
+            "username", rule.id
+        )
+        delete_field_name = "field." + self._getFieldName("delete", rule.id)
         return {
             "url": widgets_by_name[url_field_name],
             "region": widgets_by_name[region_field_name],
@@ -599,14 +634,15 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
         widgets_by_name = {widget.name: widget for widget in self.widgets}
         return {
             "image_name": widgets_by_name["field.add_image_name"],
-            "existing_credentials":
-                widgets_by_name["field.existing_credentials"],
+            "existing_credentials": widgets_by_name[
+                "field.existing_credentials"
+            ],
             "url": widgets_by_name["field.add_url"],
             "region": widgets_by_name["field.add_region"],
             "username": widgets_by_name["field.add_username"],
             "password": widgets_by_name["field.add_password"],
             "confirm_password": widgets_by_name["field.add_confirm_password"],
-            }
+        }
 
     def parseData(self, data):
         """Rearrange form data to make it easier to process."""
@@ -620,23 +656,33 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
         add_existing_credentials = data.get("existing_credentials")
 
         # parse data from the Add new rule section of the form
-        if (add_url or add_region or add_username or add_password or
-                add_confirm_password or add_image_name or
-                add_existing_credentials):
-            parsed_data.setdefault(None, {
-                "image_name": add_image_name,
-                "url": add_url,
-                "region": add_region,
-                "username": add_username,
-                "password": add_password,
-                "confirm_password": add_confirm_password,
-                "existing_credentials": data["existing_credentials"],
-                "add_credentials": data["add_credentials"],
-                "action": "add",
-            })
+        if (
+            add_url
+            or add_region
+            or add_username
+            or add_password
+            or add_confirm_password
+            or add_image_name
+            or add_existing_credentials
+        ):
+            parsed_data.setdefault(
+                None,
+                {
+                    "image_name": add_image_name,
+                    "url": add_url,
+                    "region": add_region,
+                    "username": add_username,
+                    "password": add_password,
+                    "confirm_password": add_confirm_password,
+                    "existing_credentials": data["existing_credentials"],
+                    "add_credentials": data["add_credentials"],
+                    "action": "add",
+                },
+            )
         # parse data from the Edit existing rule section of the form
         for field_name in sorted(
-                name for name in data if name.split(".")[0] == "image_name"):
+            name for name in data if name.split(".")[0] == "image_name"
+        ):
             _, rule_id = self._parseFieldName(field_name)
             image_field_name = self._getFieldName("image_name", rule_id)
             delete_field_name = self._getFieldName("delete", rule_id)
@@ -644,10 +690,13 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
                 action = "delete"
             else:
                 action = "change"
-            parsed_data.setdefault(rule_id, {
-                "image_name": data.get(image_field_name),
-                "action": action,
-            })
+            parsed_data.setdefault(
+                rule_id,
+                {
+                    "image_name": data.get(image_field_name),
+                    "action": action,
+                },
+            )
 
         return parsed_data
 
@@ -678,22 +727,27 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
                 return
             if password != confirm_password:
                 self.setFieldError(
-                    "add_confirm_password", "Passwords do not match.")
+                    "add_confirm_password", "Passwords do not match."
+                )
                 return
 
             credentials_set = getUtility(IOCIRegistryCredentialsSet)
             try:
-                credential_data = {'username': username, 'password': password}
+                credential_data = {"username": username, "password": password}
                 if region is not None:
-                    credential_data['region'] = region
+                    credential_data["region"] = region
                 credentials = credentials_set.getOrCreate(
-                    registrant=self.user, owner=self.context.owner, url=url,
-                    credentials=credential_data)
+                    registrant=self.user,
+                    owner=self.context.owner,
+                    url=url,
+                    credentials=credential_data,
+                )
             except OCIRegistryCredentialsAlreadyExist:
                 self.setFieldError(
                     "add_url",
                     "Credentials already exist with the same URL, username, "
-                    "and region.")
+                    "and region.",
+                )
                 return
             except ValidationError:
                 self.setFieldError("add_url", "Not a valid URL.")
@@ -701,17 +755,17 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
 
         try:
             getUtility(IOCIPushRuleSet).new(
-                self.context, credentials, image_name)
+                self.context, credentials, image_name
+            )
         except OCIPushRuleAlreadyExists:
             self.setFieldError(
                 "add_image_name",
                 "A push rule already exists with the same URL, image name, "
-                "and credentials.")
+                "and credentials.",
+            )
 
     def updatePushRulesFromData(self, parsed_data):
-        rules_map = {
-            rule.id: rule
-            for rule in self.context.push_rules}
+        rules_map = {rule.id: rule for rule in self.context.push_rules}
         for rule_id, parsed_rules in parsed_data.items():
             rule = rules_map.get(rule_id)
             action = parsed_rules["action"]
@@ -720,9 +774,9 @@ class OCIRecipeEditPushRulesView(LaunchpadFormView):
                 image_name = parsed_rules["image_name"]
                 if not image_name:
                     self.setFieldError(
-                        self._getFieldName(
-                            "image_name", rule_id),
-                        "Image name must be set.")
+                        self._getFieldName("image_name", rule_id),
+                        "Image name must be set.",
+                    )
                 else:
                     if rule.image_name != image_name:
                         rule.setNewImageName(image_name)
@@ -748,16 +802,18 @@ class OCIRecipeRequestBuildsView(LaunchpadFormView):
 
     @property
     def label(self):
-        return 'Request builds for %s' % self.context.name
+        return "Request builds for %s" % self.context.name
 
-    page_title = 'Request builds'
+    page_title = "Request builds"
 
     class schema(Interface):
         """Schema for requesting a build."""
 
         distro_arch_series = List(
-            Choice(vocabulary='OCIRecipeDistroArchSeries'),
-            title='Architectures', required=True)
+            Choice(vocabulary="OCIRecipeDistroArchSeries"),
+            title="Architectures",
+            required=True,
+        )
 
     custom_widget_distro_arch_series = LabeledMultiCheckBoxWidget
 
@@ -768,61 +824,71 @@ class OCIRecipeRequestBuildsView(LaunchpadFormView):
     @property
     def initial_values(self):
         """See `LaunchpadFormView`."""
-        return {'distro_arch_series': self.context.getAllowedArchitectures()}
+        return {"distro_arch_series": self.context.getAllowedArchitectures()}
 
     def validate(self, data):
         """See `LaunchpadFormView`."""
-        arches = data.get('distro_arch_series', [])
+        arches = data.get("distro_arch_series", [])
         if not arches:
             self.setFieldError(
-                'distro_arch_series',
-                'You need to select at least one architecture.')
+                "distro_arch_series",
+                "You need to select at least one architecture.",
+            )
 
-    @action('Request builds', name='request')
+    @action("Request builds", name="request")
     def request_action(self, action, data):
-        if data.get('distro_arch_series'):
+        if data.get("distro_arch_series"):
             architectures = [
-                arch.architecturetag for arch in data['distro_arch_series']]
+                arch.architecturetag for arch in data["distro_arch_series"]
+            ]
         else:
             architectures = None
         self.context.requestBuilds(self.user, architectures)
         self.request.response.addNotification(
             "Your builds were scheduled and should start soon. "
-            "Refresh this page for details.")
+            "Refresh this page for details."
+        )
         self.next_url = self.cancel_url
 
 
 class IOCIRecipeEditSchema(Interface):
     """Schema for adding or editing an OCI recipe."""
 
-    use_template(IOCIRecipe, include=[
-        "name",
-        "owner",
-        "information_type",
-        "description",
-        "git_ref",
-        "build_file",
-        "build_args",
-        "build_path",
-        "build_daily",
-        "require_virtualized",
-        "allow_internet",
-        ])
+    use_template(
+        IOCIRecipe,
+        include=[
+            "name",
+            "owner",
+            "information_type",
+            "description",
+            "git_ref",
+            "build_file",
+            "build_args",
+            "build_path",
+            "build_daily",
+            "require_virtualized",
+            "allow_internet",
+        ],
+    )
 
 
 class OCIRecipeFormMixin:
     """Mixin with common processing for both edit and add views."""
+
     custom_widget_build_args = CustomWidgetFactory(
-        TextAreaWidget, height=5, width=100)
+        TextAreaWidget, height=5, width=100
+    )
 
     custom_widget_information_type = CustomWidgetFactory(
         LaunchpadRadioWidgetWithDescription,
-        vocabulary=InformationTypeVocabulary(types=[]))
+        vocabulary=InformationTypeVocabulary(types=[]),
+    )
 
     def setUpInformationTypeWidget(self):
-        info_type_widget = self.widgets['information_type']
+        info_type_widget = self.widgets["information_type"]
         info_type_widget.vocabulary = InformationTypeVocabulary(
-            types=self.getInformationTypesToShow())
+            types=self.getInformationTypesToShow()
+        )
 
     def getInformationTypesToShow(self):
         """Get the information types to display on the edit form.
@@ -840,36 +906,45 @@ class OCIRecipeFormMixin:
         if IOCIRecipe.providedBy(self.context):
             default = "\n".join(
                 "%s=%s" % (k, v)
-                for k, v in sorted(self.context.build_args.items()))
+                for k, v in sorted(self.context.build_args.items())
+            )
         else:
             default = ""
-        return FormFields(Text(
-            __name__='build_args',
-            title='Build-time ARG variables',
-            description=("One per line. Each ARG should be in the format "
-                         "of ARG_KEY=arg_value."),
-            default=default,
-            required=False, readonly=False))
+        return FormFields(
+            Text(
+                __name__="build_args",
+                title="Build-time ARG variables",
+                description=(
+                    "One per line. Each ARG should be in the format "
+                    "of ARG_KEY=arg_value."
+                ),
+                default=default,
+                required=False,
+                readonly=False,
+            )
+        )
 
     def validateBuildArgs(self, data):
-        field_value = data.get('build_args')
+        field_value = data.get("build_args")
         if not field_value:
             return
         build_args = {}
         for i, line in enumerate(field_value.split("\n")):
-            if '=' not in line:
-                msg = ("'%s' at line %s is not a valid KEY=value pair." %
-                       (line, i + 1))
+            if "=" not in line:
+                msg = "'%s' at line %s is not a valid KEY=value pair." % (
+                    line,
+                    i + 1,
+                )
                 self.setFieldError("build_args", str(msg))
                 return
-            k, v = line.split('=', 1)
+            k, v = line.split("=", 1)
             build_args[k] = v
-        data['build_args'] = build_args
+        data["build_args"] = build_args
 
     def userIsRecipeAdmin(self):
         if check_permission("launchpad.Admin", self.context):
             return True
-        person = getattr(self.request.principal, 'person', None)
+        person = getattr(self.request.principal, "person", None)
         if not person:
             return False
         # Edit context = OCIRecipe, New context = OCIProject
@@ -890,7 +965,7 @@ class OCIRecipeFormMixin:
 
     @property
     def distribution_has_credentials(self):
-        if hasattr(self.context, 'oci_project'):
+        if hasattr(self.context, "oci_project"):
             oci_project = self.context.oci_project
         else:
             oci_project = self.context
@@ -898,8 +973,9 @@ class OCIRecipeFormMixin:
         return bool(distro and distro.oci_registry_credentials)
 
 
-class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
-                       OCIRecipeFormMixin):
+class OCIRecipeAddView(
+    LaunchpadFormView, EnableProcessorsMixin, OCIRecipeFormMixin
+):
     """View for creating OCI recipes."""
 
     page_title = label = "Create a new OCI recipe"
@@ -914,7 +990,7 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
         "build_file",
         "build_path",
         "build_daily",
-        )
+    )
     custom_widget_git_ref = GitRefWidget
 
     def initialize(self):
@@ -930,25 +1006,36 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
             getUtility(IProcessorSet).getAll(),
             "The architectures that this OCI recipe builds for. Some "
             "architectures are restricted and may only be enabled or "
-            "disabled by administrators.")
-        self.form_fields += FormFields(Bool(
-            __name__="official_recipe",
-            title="Official recipe",
-            description=(
-                "Mark this recipe as official for this OCI Project. "
-                "Allows use of distribution registry credentials "
-                "and the default git repository routing. "
-                "May only be enabled by the owner of the OCI Project."),
-            default=False,
-            required=False, readonly=False))
-        if self.distribution_has_credentials:
-            self.form_fields += FormFields(TextLine(
-                __name__='image_name',
-                title="Image name",
+            "disabled by administrators.",
+        )
+        self.form_fields += FormFields(
+            Bool(
+                __name__="official_recipe",
+                title="Official recipe",
                 description=(
-                    "Name to use for registry upload. "
-                    "Defaults to the name of the recipe."),
-                required=False, readonly=False))
+                    "Mark this recipe as official for this OCI Project. "
+                    "Allows use of distribution registry credentials "
+                    "and the default git repository routing. "
+                    "May only be enabled by the owner of the OCI Project."
+                ),
+                default=False,
+                required=False,
+                readonly=False,
+            )
+        )
+        if self.distribution_has_credentials:
+            self.form_fields += FormFields(
+                TextLine(
+                    __name__="image_name",
+                    title="Image name",
+                    description=(
+                        "Name to use for registry upload. "
+                        "Defaults to the name of the recipe."
+                    ),
+                    required=False,
+                    readonly=False,
+                )
+            )
 
     def setUpGitRefWidget(self):
         """Setup GitRef widget indicating the user to use the default
@@ -963,13 +1050,15 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
             # Do not override more important git_ref errors.
             return
         default_repo = getUtility(IGitRepositorySet).getDefaultRepository(
-            self.context)
+            self.context
+        )
         if default_repo is None:
             msg = (
-                'The default git repository for this OCI project was not '
-                'created yet.<br/>'
+                "The default git repository for this OCI project was not "
+                "created yet.<br/>"
                 'Check the <a href="%s">OCI project page</a> for instructions '
-                'on how to create one.')
+                "on how to create one."
+            )
             msg = structured(msg, canonical_url(self.context))
             self.widget_errors["git_ref"] = msg.escapedtext
 
@@ -981,7 +1070,7 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
         self.setUpGitRefWidget()
         # disable the official recipe button if the user doesn't have
         # permissions to change it
-        widget = self.widgets['official_recipe']
+        widget = self.widgets["official_recipe"]
         if not self.userIsRecipeAdmin():
             widget.extra = "disabled='disabled'"
 
@@ -998,9 +1087,11 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
             "build_file": "Dockerfile",
             "build_path": ".",
             "processors": [
-                p for p in getUtility(IProcessorSet).getAll()
-                if p.build_by_default],
-            }
+                p
+                for p in getUtility(IProcessorSet).getAll()
+                if p.build_by_default
+            ],
+        }
 
     def validate(self, data):
         """See `LaunchpadFormView`."""
@@ -1012,27 +1103,36 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
                 self.setFieldError(
                     "name",
                     "There is already an OCI recipe owned by %s in %s with "
-                    "this name." % (
-                        owner.display_name, self.context.display_name))
+                    "this name."
+                    % (owner.display_name, self.context.display_name),
+                )
         self.validateBuildArgs(data)
         official = data.get("official_recipe", None)
         if official and not self.userIsRecipeAdmin():
             self.setFieldError(
                 "official_recipe",
                 "You do not have permission to set the official status "
-                "of this recipe.")
+                "of this recipe.",
+            )
 
     @action("Create OCI recipe", name="create")
     def create_action(self, action, data):
         recipe = getUtility(IOCIRecipeSet).new(
-            name=data["name"], registrant=self.user, owner=data["owner"],
-            oci_project=self.context, git_ref=data["git_ref"],
-            build_file=data["build_file"], description=data["description"],
-            build_daily=data["build_daily"], build_args=data["build_args"],
-            build_path=data["build_path"], processors=data["processors"],
-            official=data.get('official_recipe', False),
+            name=data["name"],
+            registrant=self.user,
+            owner=data["owner"],
+            oci_project=self.context,
+            git_ref=data["git_ref"],
+            build_file=data["build_file"],
+            description=data["description"],
+            build_daily=data["build_daily"],
+            build_args=data["build_args"],
+            build_path=data["build_path"],
+            processors=data["processors"],
+            official=data.get("official_recipe", False),
             # image_name is only available if using distribution credentials.
-            image_name=data.get("image_name"))
+            image_name=data.get("image_name"),
+        )
         self.next_url = canonical_url(recipe)
 
 
@@ -1055,12 +1155,14 @@ class BaseOCIRecipeEditView(LaunchpadEditFormView):
         if new_processors is not None:
             if set(self.context.processors) != set(new_processors):
                 self.context.setProcessors(
-                    new_processors, check_permissions=True, user=self.user)
+                    new_processors, check_permissions=True, user=self.user
+                )
             del data["processors"]
-        official = data.pop('official_recipe', None)
+        official = data.pop("official_recipe", None)
         if official is not None and self.userIsRecipeAdmin():
             self.context.oci_project.setOfficialRecipeStatus(
-                self.context, official)
+                self.context, official
+            )
 
         self.updateContextFromData(data)
         self.next_url = canonical_url(self.context)
@@ -1083,8 +1185,9 @@ class OCIRecipeAdminView(BaseOCIRecipeEditView):
     field_names = ("require_virtualized", "allow_internet")
 
 
-class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
-                        OCIRecipeFormMixin):
+class OCIRecipeEditView(
+    BaseOCIRecipeEditView, EnableProcessorsMixin, OCIRecipeFormMixin
+):
     """View for editing OCI recipes."""
 
     @property
@@ -1102,7 +1205,7 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
         "build_file",
         "build_path",
         "build_daily",
-        )
+    )
     custom_widget_git_ref = GitRefWidget
 
     def setUpGitRefWidget(self):
@@ -1119,17 +1222,21 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
             return
         msg = None
         if self.context.git_ref.namespace.target != self.context.oci_project:
-            msg = ("This recipe's git repository is not in the "
-                   "correct namespace.<br/>")
+            msg = (
+                "This recipe's git repository is not in the "
+                "correct namespace.<br/>"
+            )
             default_repo = getUtility(IGitRepositorySet).getDefaultRepository(
-                oci_proj)
+                oci_proj
+            )
             if default_repo:
-                link = GitRepositoryFormatterAPI(default_repo).link('')
+                link = GitRepositoryFormatterAPI(default_repo).link("")
                 msg += "Consider using %s instead." % link
             else:
                 msg += (
                     'Check the <a href="%(oci_proj_url)s">OCI project page</a>'
-                    ' for instructions on how to create it correctly.')
+                    " for instructions on how to create it correctly."
+                )
         if msg:
             msg = structured(msg, oci_proj_url=oci_proj_url)
             self.widget_errors["git_ref"] = msg.escapedtext
@@ -1141,7 +1248,7 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
         self.setUpGitRefWidget()
         # disable the official recipe button if the user doesn't have
         # permissions to change it
-        widget = self.widgets['official_recipe']
+        widget = self.widgets["official_recipe"]
         if not self.userIsRecipeAdmin():
             widget.extra = "disabled='disabled'"
 
@@ -1153,26 +1260,37 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
             self.context.available_processors,
             "The architectures that this OCI recipe builds for. Some "
             "architectures are restricted and may only be enabled or "
-            "disabled by administrators.")
-        self.form_fields += FormFields(Bool(
-            __name__="official_recipe",
-            title="Official recipe",
-            description=(
-                "Mark this recipe as official for this OCI Project. "
-                "Allows use of distribution registry credentials "
-                "and the default git repository routing. "
-                "May only be enabled by the owner of the OCI Project."),
-            default=self.context.official,
-            required=False, readonly=False))
-        if self.distribution_has_credentials:
-            self.form_fields += FormFields(TextLine(
-                __name__='image_name',
-                title="Image name",
+            "disabled by administrators.",
+        )
+        self.form_fields += FormFields(
+            Bool(
+                __name__="official_recipe",
+                title="Official recipe",
                 description=(
-                    "Name to use for registry upload. "
-                    "Defaults to the name of the recipe."),
-                default=self.context.image_name,
-                required=False, readonly=False))
+                    "Mark this recipe as official for this OCI Project. "
+                    "Allows use of distribution registry credentials "
+                    "and the default git repository routing. "
+                    "May only be enabled by the owner of the OCI Project."
+                ),
+                default=self.context.official,
+                required=False,
+                readonly=False,
+            )
+        )
+        if self.distribution_has_credentials:
+            self.form_fields += FormFields(
+                TextLine(
+                    __name__="image_name",
+                    title="Image name",
+                    description=(
+                        "Name to use for registry upload. "
+                        "Defaults to the name of the recipe."
+                    ),
+                    default=self.context.image_name,
+                    required=False,
+                    readonly=False,
+                )
+            )
 
     def validate(self, data):
         """See `LaunchpadFormView`."""
@@ -1184,14 +1302,18 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
         if owner and name:
             try:
                 recipe = getUtility(IOCIRecipeSet).getByName(
-                    owner, self.context.oci_project, name)
+                    owner, self.context.oci_project, name
+                )
                 if recipe != self.context:
                     self.setFieldError(
                         "name",
                         "There is already an OCI recipe owned by %s in %s "
-                        "with this name." % (
+                        "with this name."
+                        % (
                             owner.display_name,
-                            self.context.oci_project.display_name))
+                            self.context.oci_project.display_name,
+                        ),
+                    )
             except NoSuchOCIRecipe:
                 pass
         if "processors" in data:
@@ -1208,14 +1330,15 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
                         # enabled. Leave it untouched.
                         data["processors"].append(processor)
         self.validateBuildArgs(data)
-        official = data.get('official_recipe')
+        official = data.get("official_recipe")
         official_change = self.context.official != official
         is_admin = self.userIsRecipeAdmin()
         if official is not None and official_change and not is_admin:
             self.setFieldError(
                 "official_recipe",
                 "You do not have permission to change the official status "
-                "of this recipe.")
+                "of this recipe.",
+            )
 
 
 class OCIRecipeDeleteView(BaseOCIRecipeEditView):
diff --git a/lib/lp/oci/browser/ocirecipebuild.py b/lib/lp/oci/browser/ocirecipebuild.py
index 9f1d55e..7aaad43 100644
--- a/lib/lp/oci/browser/ocirecipebuild.py
+++ b/lib/lp/oci/browser/ocirecipebuild.py
@@ -4,35 +4,32 @@
 """OCI recipe build views."""
 
 __all__ = [
-    'OCIRecipeBuildCancelView',
-    'OCIRecipeBuildContextMenu',
-    'OCIRecipeBuildNavigation',
-    'OCIRecipeBuildRescoreView',
-    'OCIRecipeBuildView',
-    ]
+    "OCIRecipeBuildCancelView",
+    "OCIRecipeBuildContextMenu",
+    "OCIRecipeBuildNavigation",
+    "OCIRecipeBuildRescoreView",
+    "OCIRecipeBuildView",
+]
 
 from zope.interface import Interface
 
-from lp.app.browser.launchpadform import (
-    action,
-    LaunchpadFormView,
-    )
+from lp.app.browser.launchpadform import LaunchpadFormView, action
 from lp.oci.interfaces.ocirecipebuild import (
     CannotScheduleRegistryUpload,
     IOCIRecipeBuild,
-    )
+)
 from lp.services.librarian.browser import (
     FileNavigationMixin,
     ProxiedLibraryFileAlias,
-    )
+)
 from lp.services.propertycache import cachedproperty
 from lp.services.webapp import (
-    canonical_url,
     ContextMenu,
-    enabled_with_permission,
     Link,
     Navigation,
-    )
+    canonical_url,
+    enabled_with_permission,
+)
 from lp.soyuz.interfaces.binarypackagebuild import IBuildRescoreForm
 
 
@@ -53,20 +50,29 @@ class OCIRecipeBuildContextMenu(ContextMenu):
     @enabled_with_permission("launchpad.Edit")
     def retry(self):
         return Link(
-            "+retry", "Retry this build", icon="retry",
-            enabled=self.context.can_be_retried)
+            "+retry",
+            "Retry this build",
+            icon="retry",
+            enabled=self.context.can_be_retried,
+        )
 
     @enabled_with_permission("launchpad.Edit")
     def cancel(self):
         return Link(
-            "+cancel", "Cancel build", icon="remove",
-            enabled=self.context.can_be_cancelled)
+            "+cancel",
+            "Cancel build",
+            icon="remove",
+            enabled=self.context.can_be_cancelled,
+        )
 
     @enabled_with_permission("launchpad.Admin")
     def rescore(self):
         return Link(
-            "+rescore", "Rescore build", icon="edit",
-            enabled=self.context.can_be_rescored)
+            "+rescore",
+            "Rescore build",
+            icon="edit",
+            enabled=self.context.can_be_rescored,
+        )
 
 
 class OCIRecipeBuildView(LaunchpadFormView):
@@ -89,7 +95,9 @@ class OCIRecipeBuildView(LaunchpadFormView):
 
         return [
             ProxiedLibraryFileAlias(alias, self.context)
-            for _, alias, _ in self.context.getFiles() if not alias.deleted]
+            for _, alias, _ in self.context.getFiles()
+            if not alias.deleted
+        ]
 
     @cachedproperty
     def has_files(self):
@@ -109,7 +117,8 @@ class OCIRecipeBuildView(LaunchpadFormView):
         else:
             self.request.response.addInfoNotification(
                 "An upload has been scheduled and will run as soon as "
-                "possible.")
+                "possible."
+            )
 
 
 class OCIRecipeBuildRetryView(LaunchpadFormView):
@@ -123,6 +132,7 @@ class OCIRecipeBuildRetryView(LaunchpadFormView):
     @property
     def cancel_url(self):
         return canonical_url(self.context)
+
     next_url = cancel_url
 
     @action("Retry build", name="retry")
@@ -130,7 +140,8 @@ class OCIRecipeBuildRetryView(LaunchpadFormView):
         """Retry the build."""
         if not self.context.can_be_retried:
             self.request.response.addErrorNotification(
-                "Build cannot be retried")
+                "Build cannot be retried"
+            )
         else:
             self.context.retry()
             self.request.response.addInfoNotification("Build has been queued")
@@ -149,6 +160,7 @@ class OCIRecipeBuildCancelView(LaunchpadFormView):
     @property
     def cancel_url(self):
         return canonical_url(self.context)
+
     next_url = cancel_url
 
     @action("Cancel build", name="cancel")
@@ -168,12 +180,14 @@ class OCIRecipeBuildRescoreView(LaunchpadFormView):
         if self.context.can_be_rescored:
             return super().__call__()
         self.request.response.addWarningNotification(
-            "Cannot rescore this build because it is not queued.")
+            "Cannot rescore this build because it is not queued."
+        )
         self.request.response.redirect(canonical_url(self.context))
 
     @property
     def cancel_url(self):
         return canonical_url(self.context)
+
     next_url = cancel_url
 
     @action("Rescore build", name="rescore")
diff --git a/lib/lp/oci/browser/ocirecipesubscription.py b/lib/lp/oci/browser/ocirecipesubscription.py
index c4f016f..65643ba 100644
--- a/lib/lp/oci/browser/ocirecipesubscription.py
+++ b/lib/lp/oci/browser/ocirecipesubscription.py
@@ -3,9 +3,7 @@
 
 """OCI recipe subscription views."""
 
-__all__ = [
-    'OCIRecipePortletSubscribersContent'
-]
+__all__ = ["OCIRecipePortletSubscribersContent"]
 
 from zope.component import getUtility
 from zope.formlib.form import action
@@ -14,17 +12,14 @@ from zope.security.interfaces import ForbiddenAttribute
 from lp.app.browser.launchpadform import (
     LaunchpadEditFormView,
     LaunchpadFormView,
-    )
+)
 from lp.oci.interfaces.ocirecipesubscription import IOCIRecipeSubscription
 from lp.registry.interfaces.person import IPersonSet
-from lp.services.webapp import (
-    canonical_url,
-    LaunchpadView,
-    )
+from lp.services.webapp import LaunchpadView, canonical_url
 from lp.services.webapp.authorization import (
     check_permission,
     precache_permission_for_objects,
-    )
+)
 
 
 class OCIRecipePortletSubscribersContent(LaunchpadView):
@@ -38,20 +33,28 @@ class OCIRecipePortletSubscribersContent(LaunchpadView):
         # need the expense of running several complex SQL queries.
         subscriptions = list(self.context.subscriptions)
         person_ids = [sub.person.id for sub in subscriptions]
-        list(getUtility(IPersonSet).getPrecachedPersonsFromIDs(
-            person_ids, need_validity=True))
+        list(
+            getUtility(IPersonSet).getPrecachedPersonsFromIDs(
+                person_ids, need_validity=True
+            )
+        )
         if self.user is not None:
             subscribers = [
-                subscription.person for subscription in subscriptions]
+                subscription.person for subscription in subscriptions
+            ]
             precache_permission_for_objects(
-                self.request, "launchpad.LimitedView", subscribers)
+                self.request, "launchpad.LimitedView", subscribers
+            )
 
         visible_subscriptions = [
-            subscription for subscription in subscriptions
-            if check_permission("launchpad.LimitedView", subscription.person)]
+            subscription
+            for subscription in subscriptions
+            if check_permission("launchpad.LimitedView", subscription.person)
+        ]
         return sorted(
             visible_subscriptions,
-            key=lambda subscription: subscription.person.displayname)
+            key=lambda subscription: subscription.person.displayname,
+        )
 
 
 class RedirectToOCIRecipeMixin:
@@ -73,23 +76,25 @@ class RedirectToOCIRecipeMixin:
     cancel_url = next_url
 
 
-class OCIRecipeSubscriptionEditView(RedirectToOCIRecipeMixin,
-                                    LaunchpadEditFormView):
+class OCIRecipeSubscriptionEditView(
+    RedirectToOCIRecipeMixin, LaunchpadEditFormView
+):
     """The view for editing OCI recipe subscriptions."""
+
     schema = IOCIRecipeSubscription
     field_names = []
 
     @property
     def page_title(self):
         return (
-            "Edit subscription to OCI recipe %s" %
-            self.ocirecipe.displayname)
+            "Edit subscription to OCI recipe %s" % self.ocirecipe.displayname
+        )
 
     @property
     def label(self):
         return (
-            "Edit subscription to OCI recipe for %s" %
-            self.person.displayname)
+            "Edit subscription to OCI recipe for %s" % self.person.displayname
+        )
 
     def initialize(self):
         self.ocirecipe = self.context.recipe
@@ -102,11 +107,13 @@ class OCIRecipeSubscriptionEditView(RedirectToOCIRecipeMixin,
         self.ocirecipe.unsubscribe(self.person, self.user)
         self.request.response.addNotification(
             "%s has been unsubscribed from this OCI recipe."
-            % self.person.displayname)
+            % self.person.displayname
+        )
 
 
-class _OCIRecipeSubscriptionCreationView(RedirectToOCIRecipeMixin,
-                                         LaunchpadFormView):
+class _OCIRecipeSubscriptionCreationView(
+    RedirectToOCIRecipeMixin, LaunchpadFormView
+):
     """Contains the common functionality of the Add and Edit views."""
 
     schema = IOCIRecipeSubscription
@@ -127,11 +134,13 @@ class OCIRecipeSubscriptionAddView(_OCIRecipeSubscriptionCreationView):
         # subscribed before continuing.
         if self.context.getSubscription(self.user) is not None:
             self.request.response.addNotification(
-                "You are already subscribed to this OCI recipe.")
+                "You are already subscribed to this OCI recipe."
+            )
         else:
             self.context.subscribe(self.user, self.user)
             self.request.response.addNotification(
-                "You have subscribed to this OCI recipe.")
+                "You have subscribed to this OCI recipe."
+            )
 
 
 class OCIRecipeSubscriptionAddOtherView(_OCIRecipeSubscriptionCreationView):
@@ -150,12 +159,14 @@ class OCIRecipeSubscriptionAddOtherView(_OCIRecipeSubscriptionCreationView):
         if "person" in data:
             person = data["person"]
             subscription = self.context.getSubscription(person)
-            if (subscription is None
-                    and not self.context.userCanBeSubscribed(person)):
+            if subscription is None and not self.context.userCanBeSubscribed(
+                person
+            ):
                 self.setFieldError(
                     "person",
                     "Open and delegated teams cannot be subscribed to "
-                    "private OCI recipes.")
+                    "private OCI recipes.",
+                )
 
     @action("Subscribe", name="subscribe_action")
     def subscribe_action(self, action, data):
@@ -165,9 +176,11 @@ class OCIRecipeSubscriptionAddOtherView(_OCIRecipeSubscriptionCreationView):
         if subscription is None:
             self.context.subscribe(person, self.user)
             self.request.response.addNotification(
-                "%s has been subscribed to this OCI recipe." %
-                person.displayname)
+                "%s has been subscribed to this OCI recipe."
+                % person.displayname
+            )
         else:
             self.request.response.addNotification(
-                "%s was already subscribed to this OCI recipe." %
-                person.displayname)
+                "%s was already subscribed to this OCI recipe."
+                % person.displayname
+            )
diff --git a/lib/lp/oci/browser/tests/test_ocirecipe.py b/lib/lp/oci/browser/tests/test_ocirecipe.py
index b135ed8..3050f61 100644
--- a/lib/lp/oci/browser/tests/test_ocirecipe.py
+++ b/lib/lp/oci/browser/tests/test_ocirecipe.py
@@ -3,16 +3,13 @@
 
 """Test OCI recipe views."""
 
-from datetime import (
-    datetime,
-    timedelta,
-    )
+from datetime import datetime, timedelta
 from operator import attrgetter
 from urllib.parse import quote
 
-from fixtures import FakeLogger
 import pytz
 import soupmatchers
+from fixtures import FakeLogger
 from storm.locals import Store
 from testtools.matchers import (
     Equals,
@@ -21,7 +18,7 @@ from testtools.matchers import (
     MatchesSetwise,
     MatchesStructure,
     Not,
-    )
+)
 from zope.component import getUtility
 from zope.publisher.interfaces import NotFound
 from zope.security.interfaces import Unauthorized
@@ -38,20 +35,18 @@ from lp.oci.browser.ocirecipe import (
     OCIRecipeAdminView,
     OCIRecipeEditView,
     OCIRecipeView,
-    )
+)
 from lp.oci.interfaces.ocipushrule import (
     IOCIPushRuleSet,
     OCIPushRuleAlreadyExists,
-    )
+)
 from lp.oci.interfaces.ocirecipe import (
+    OCI_RECIPE_ALLOW_CREATE,
     CannotModifyOCIRecipeProcessor,
     IOCIRecipeSet,
-    OCI_RECIPE_ALLOW_CREATE,
-    )
+)
 from lp.oci.interfaces.ocirecipejob import IOCIRecipeRequestBuildsJobSource
-from lp.oci.interfaces.ociregistrycredentials import (
-    IOCIRegistryCredentialsSet,
-    )
+from lp.oci.interfaces.ociregistrycredentials import IOCIRegistryCredentialsSet
 from lp.oci.tests.helpers import OCIConfigHelperMixin
 from lp.registry.enums import BranchSharingPolicy
 from lp.registry.interfaces.person import IPersonSet
@@ -64,36 +59,27 @@ from lp.services.propertycache import get_property_cache
 from lp.services.webapp import canonical_url
 from lp.services.webapp.servers import LaunchpadTestRequest
 from lp.testing import (
+    BrowserTestCase,
+    TestCaseWithFactory,
     admin_logged_in,
     anonymous_logged_in,
-    BrowserTestCase,
     login,
     login_person,
     person_logged_in,
     record_two_runs,
-    TestCaseWithFactory,
     time_counter,
-    )
+)
 from lp.testing.dbuser import dbuser
-from lp.testing.layers import (
-    DatabaseFunctionalLayer,
-    LaunchpadFunctionalLayer,
-    )
-from lp.testing.matchers import (
-    MatchesPickerText,
-    MatchesTagText,
-    )
+from lp.testing.layers import DatabaseFunctionalLayer, LaunchpadFunctionalLayer
+from lp.testing.matchers import MatchesPickerText, MatchesTagText
 from lp.testing.pages import (
     extract_text,
     find_main_content,
     find_tag_by_id,
     find_tags_by_class,
-    )
+)
 from lp.testing.publication import test_traverse
-from lp.testing.views import (
-    create_initialized_view,
-    create_view,
-    )
+from lp.testing.views import create_initialized_view, create_view
 
 
 class TestOCIRecipeNavigation(TestCaseWithFactory):
@@ -102,19 +88,25 @@ class TestOCIRecipeNavigation(TestCaseWithFactory):
 
     def setUp(self):
         super().setUp()
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: "on"}))
 
     def test_canonical_url(self):
         owner = self.factory.makePerson(name="person")
         distribution = self.factory.makeDistribution(name="distro")
         oci_project = self.factory.makeOCIProject(
-            pillar=distribution, ociprojectname="oci-project")
+            pillar=distribution, ociprojectname="oci-project"
+        )
         recipe = self.factory.makeOCIRecipe(
-            name="recipe", registrant=owner, owner=owner,
-            oci_project=oci_project)
+            name="recipe",
+            registrant=owner,
+            owner=owner,
+            oci_project=oci_project,
+        )
         self.assertEqual(
             "http://launchpad.test/~person/distro/+oci/oci-project/"
-            "+recipe/recipe", canonical_url(recipe))
+            "+recipe/recipe",
+            canonical_url(recipe),
+        )
 
     def test_recipe_traverse_distribution(self):
         # Make sure we can reach recipe of distro-based OCI projects.
@@ -122,9 +114,14 @@ class TestOCIRecipeNavigation(TestCaseWithFactory):
         oci_project = self.factory.makeOCIProject(pillar=distro)
         recipe = self.factory.makeOCIRecipe(oci_project=oci_project)
         obj, _, _ = test_traverse(
-            "http://launchpad.test/~%s/%s/+oci/%s/+recipe/%s" % (
-                recipe.owner.name, recipe.oci_project.pillar.name,
-                recipe.oci_project.name, recipe.name))
+            "http://launchpad.test/~%s/%s/+oci/%s/+recipe/%s"
+            % (
+                recipe.owner.name,
+                recipe.oci_project.pillar.name,
+                recipe.oci_project.name,
+                recipe.name,
+            )
+        )
         self.assertEqual(recipe, obj)
 
     def test_recipe_traverse_project(self):
@@ -133,9 +130,14 @@ class TestOCIRecipeNavigation(TestCaseWithFactory):
         oci_project = self.factory.makeOCIProject(pillar=project)
         recipe = self.factory.makeOCIRecipe(oci_project=oci_project)
         obj, _, _ = test_traverse(
-            "http://launchpad.test/~%s/%s/+oci/%s/+recipe/%s" % (
-                recipe.owner.name, recipe.oci_project.pillar.name,
-                recipe.oci_project.name, recipe.name))
+            "http://launchpad.test/~%s/%s/+oci/%s/+recipe/%s"
+            % (
+                recipe.owner.name,
+                recipe.oci_project.pillar.name,
+                recipe.oci_project.name,
+                recipe.name,
+            )
+        )
         self.assertEqual(recipe, obj)
 
 
@@ -147,20 +149,24 @@ class BaseTestOCIRecipeView(BrowserTestCase):
         super().setUp()
         self.useFixture(FakeLogger())
         self.person = self.factory.makePerson(
-            name="test-person", displayname="Test Person")
+            name="test-person", displayname="Test Person"
+        )
 
 
 class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
-
     def setUp(self):
         super().setUp()
         self.distroseries = self.factory.makeDistroSeries()
         self.distribution = self.distroseries.distribution
-        self.useFixture(FeatureFixture({
-            OCI_RECIPE_ALLOW_CREATE: "on",
-            "oci.build_series.%s" % self.distribution.name:
-                self.distroseries.name,
-            }))
+        self.useFixture(
+            FeatureFixture(
+                {
+                    OCI_RECIPE_ALLOW_CREATE: "on",
+                    "oci.build_series.%s"
+                    % self.distribution.name: self.distroseries.name,
+                }
+            )
+        )
         self.setConfig()
 
     def setUpDistroSeries(self):
@@ -169,138 +175,166 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         for name in processor_names:
             processor = getUtility(IProcessorSet).getByName(name)
             self.factory.makeDistroArchSeries(
-                distroseries=self.distroseries, architecturetag=name,
-                processor=processor)
+                distroseries=self.distroseries,
+                architecturetag=name,
+                processor=processor,
+            )
 
     def assertProcessorControls(self, processors_control, enabled, disabled):
         matchers = [
             MatchesStructure.byEquality(optionValue=name, disabled=False)
-            for name in enabled]
-        matchers.extend([
-            MatchesStructure.byEquality(optionValue=name, disabled=True)
-            for name in disabled])
+            for name in enabled
+        ]
+        matchers.extend(
+            [
+                MatchesStructure.byEquality(optionValue=name, disabled=True)
+                for name in disabled
+            ]
+        )
         self.assertThat(processors_control.controls, MatchesSetwise(*matchers))
 
     def test_create_new_recipe_not_logged_in(self):
         oci_project = self.factory.makeOCIProject()
         self.assertRaises(
-            Unauthorized, self.getViewBrowser, oci_project,
-            view_name="+new-recipe", no_login=True)
+            Unauthorized,
+            self.getViewBrowser,
+            oci_project,
+            view_name="+new-recipe",
+            no_login=True,
+        )
 
     def test_create_new_recipe(self):
         oci_project = self.factory.makeOCIProject()
         oci_project_display = oci_project.display_name
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         source_display = git_ref.display_name
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
         browser.getControl("Create OCI recipe").click()
 
         content = find_main_content(browser.contents)
         self.assertEqual("recipe-name", extract_text(content.h1))
         self.assertThat(
-            "Recipe description",
-            MatchesTagText(content, "recipe-description"))
+            "Recipe description", MatchesTagText(content, "recipe-description")
+        )
         self.assertThat(
-            "Test Person", MatchesPickerText(content, "edit-owner"))
+            "Test Person", MatchesPickerText(content, "edit-owner")
+        )
         self.assertThat(
             "OCI project:\n%s" % oci_project_display,
-            MatchesTagText(content, "oci-project"))
+            MatchesTagText(content, "oci-project"),
+        )
         self.assertThat(
             "Source:\n%s\nEdit OCI recipe" % source_display,
-            MatchesTagText(content, "source"))
+            MatchesTagText(content, "source"),
+        )
         self.assertThat(
             "Build file path:\nDockerfile\n"
             "Edit OCI recipe\n"
             "Build context directory:\n.\n"
             "Edit OCI recipe",
-            MatchesTagText(content, "build-file"))
+            MatchesTagText(content, "build-file"),
+        )
         self.assertThat(
             "Build schedule:\nBuilt on request\nEdit OCI recipe\n",
-            MatchesTagText(content, "build-schedule"))
+            MatchesTagText(content, "build-schedule"),
+        )
         self.assertThat(
-            "Official recipe:\nNo",
-            MatchesTagText(content, "official-recipe"))
+            "Official recipe:\nNo", MatchesTagText(content, "official-recipe")
+        )
 
     def test_create_new_available_information_types(self):
         public_pillar = self.factory.makeProduct(owner=self.person)
         private_pillar = self.factory.makeProduct(
             owner=self.person,
             information_type=InformationType.PROPRIETARY,
-            branch_sharing_policy=BranchSharingPolicy.PROPRIETARY)
+            branch_sharing_policy=BranchSharingPolicy.PROPRIETARY,
+        )
         public_oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=public_pillar)
+            registrant=self.person, pillar=public_pillar
+        )
         private_oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=private_pillar)
+            registrant=self.person, pillar=private_pillar
+        )
 
         # Public pillar.
         browser = self.getViewBrowser(
-            public_oci_project, view_name="+new-recipe", user=self.person)
+            public_oci_project, view_name="+new-recipe", user=self.person
+        )
         self.assertContentEqual(
-            ['PUBLIC', 'PUBLICSECURITY', 'PRIVATESECURITY', 'USERDATA'],
-            browser.getControl(name="field.information_type").options)
+            ["PUBLIC", "PUBLICSECURITY", "PRIVATESECURITY", "USERDATA"],
+            browser.getControl(name="field.information_type").options,
+        )
 
         # Proprietary pillar.
         browser = self.getViewBrowser(
-            private_oci_project, view_name="+new-recipe", user=self.person)
+            private_oci_project, view_name="+new-recipe", user=self.person
+        )
         self.assertContentEqual(
-            ['PROPRIETARY'],
-            browser.getControl(name="field.information_type").options)
+            ["PROPRIETARY"],
+            browser.getControl(name="field.information_type").options,
+        )
 
     def test_create_new_recipe_invalid_format(self):
         oci_project = self.factory.makeOCIProject()
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/invalid'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/invalid"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
         browser.getControl("Create OCI recipe").click()
         self.assertIn("Branch does not match format", browser.contents)
 
     def test_create_new_recipe_with_build_args(self):
         oci_project = self.factory.makeOCIProject()
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
-        browser.getControl("Build-time ARG variables").value = (
-            "VAR1=10\nVAR2=20")
+        browser.getControl(
+            "Build-time ARG variables"
+        ).value = "VAR1=10\nVAR2=20"
         browser.getControl("Create OCI recipe").click()
 
         content = find_main_content(browser.contents)
         self.assertEqual("recipe-name", extract_text(content.h1))
         self.assertThat(
             "Build-time\nARG variables:\nVAR1=10\nVAR2=20",
-            MatchesTagText(content, "build-args"))
+            MatchesTagText(content, "build-args"),
+        )
 
     def test_create_new_recipe_with_image_name(self):
         oci_project = self.factory.makeOCIProject()
         credentials = self.factory.makeOCIRegistryCredentials()
         with person_logged_in(oci_project.distribution.owner):
             oci_project.distribution.oci_registry_credentials = credentials
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
 
         image_name = self.factory.getUniqueUnicode()
@@ -309,29 +343,35 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         content = find_main_content(browser.contents)
         self.assertThat(
             "Registry image name:\n{}".format(image_name),
-            MatchesTagText(content, "image-name"))
+            MatchesTagText(content, "image-name"),
+        )
 
     def test_create_new_recipe_users_teams_as_owner_options(self):
         # Teams that the user is in are options for the OCI recipe owner.
         self.factory.makeTeam(
-            name="test-team", displayname="Test Team", members=[self.person])
+            name="test-team", displayname="Test Team", members=[self.person]
+        )
         oci_project = self.factory.makeOCIProject()
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         options = browser.getControl("Owner").displayOptions
         self.assertEqual(
             ["Test Person (test-person)", "Test Team (test-team)"],
-            sorted(str(option) for option in options))
+            sorted(str(option) for option in options),
+        )
 
     def test_create_new_recipe_display_processors(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         processors = browser.getControl(name="field.processors")
         self.assertContentEqual(
             ["Intel 386 (386)", "AMD 64bit (amd64)", "HPPA Processor (hppa)"],
-            [extract_text(option) for option in processors.displayOptions])
+            [extract_text(option) for option in processors.displayOptions],
+        )
         self.assertContentEqual(["386", "amd64", "hppa"], processors.options)
         self.assertContentEqual(["386", "amd64", "hppa"], processors.value)
 
@@ -341,35 +381,43 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         proc_armhf = self.factory.makeProcessor(
-            name="armhf", restricted=True, build_by_default=False)
+            name="armhf", restricted=True, build_by_default=False
+        )
         self.factory.makeDistroArchSeries(
-            distroseries=self.distroseries, architecturetag="armhf",
-            processor=proc_armhf)
+            distroseries=self.distroseries,
+            architecturetag="armhf",
+            processor=proc_armhf,
+        )
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         processors = browser.getControl(name="field.processors")
         self.assertProcessorControls(
-            processors, ["386", "amd64", "hppa"], ["armhf"])
+            processors, ["386", "amd64", "hppa"], ["armhf"]
+        )
 
     def test_create_new_recipe_processors(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         processors = browser.getControl(name="field.processors")
         processors.value = ["386", "amd64"]
         browser.getControl(name="field.name").value = "recipe-name"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
         browser.getControl("Create OCI recipe").click()
         login_person(self.person)
         recipe = getUtility(IOCIRecipeSet).getByName(
-            self.person, oci_project, "recipe-name")
+            self.person, oci_project, "recipe-name"
+        )
         self.assertContentEqual(
-            ["386", "amd64"], [proc.name for proc in recipe.processors])
+            ["386", "amd64"], [proc.name for proc in recipe.processors]
+        )
 
     def test_create_new_recipe_no_default_repo_warning(self):
         self.setUpDistroSeries()
@@ -377,12 +425,14 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         with admin_logged_in():
             oci_project_url = canonical_url(oci_project)
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         error_message = (
-            'The default git repository for this OCI project was not created '
-            'yet.<br/>'
+            "The default git repository for this OCI project was not created "
+            "yet.<br/>"
             'Check the <a href="{url}">OCI project page</a> for instructions '
-            'on how to create one.').format(url=oci_project_url)
+            "on how to create one."
+        ).format(url=oci_project_url)
         self.assertIn(error_message, browser.contents)
 
     def test_create_new_recipe_with_default_repo_already_created(self):
@@ -390,52 +440,73 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         repository = self.factory.makeGitRepository(
             name=oci_project.name,
-            target=oci_project, owner=self.person, registrant=self.person)
+            target=oci_project,
+            owner=self.person,
+            registrant=self.person,
+        )
         with person_logged_in(self.distribution.owner):
             getUtility(IGitRepositorySet).setDefaultRepository(
-                oci_project, repository)
+                oci_project, repository
+            )
             default_repo_path = "%s/+oci/%s" % (
-                self.distribution.name, oci_project.name)
+                self.distribution.name,
+                oci_project.name,
+            )
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         error_message = (
-            'The default git repository for this OCI project was not created '
-            'yet.')
+            "The default git repository for this OCI project was not created "
+            "yet."
+        )
         self.assertNotIn(error_message, browser.contents)
-        self.assertThat(browser.contents, soupmatchers.HTMLContains(
-            soupmatchers.Tag(
-                'Repository pre-filled', 'input', attrs={
-                    "id": "field.git_ref.repository",
-                    "value": default_repo_path})))
+        self.assertThat(
+            browser.contents,
+            soupmatchers.HTMLContains(
+                soupmatchers.Tag(
+                    "Repository pre-filled",
+                    "input",
+                    attrs={
+                        "id": "field.git_ref.repository",
+                        "value": default_repo_path,
+                    },
+                )
+            ),
+        )
 
     def test_official_is_disabled(self):
         oci_project = self.factory.makeOCIProject()
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         official_control = browser.getControl("Official recipe")
         self.assertTrue(official_control.disabled)
 
     def test_official_is_enabled(self):
         distribution = self.factory.makeDistribution(
-            oci_project_admin=self.person)
+            oci_project_admin=self.person
+        )
         oci_project = self.factory.makeOCIProject(pillar=distribution)
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         official_control = browser.getControl("Official recipe")
         self.assertFalse(official_control.disabled)
 
     def test_set_official(self):
         distribution = self.factory.makeDistribution(
-            oci_project_admin=self.person)
+            oci_project_admin=self.person
+        )
         oci_project = self.factory.makeOCIProject(pillar=distribution)
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
         official_control = browser.getControl("Official recipe")
         official_control.selected = True
@@ -443,28 +514,29 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
         content = find_main_content(browser.contents)
         self.assertThat(
-            "Official recipe:\nYes",
-            MatchesTagText(content, "official-recipe"))
+            "Official recipe:\nYes", MatchesTagText(content, "official-recipe")
+        )
 
     def test_set_official_multiple(self):
         distribution = self.factory.makeDistribution(
-            oci_project_admin=self.person)
+            oci_project_admin=self.person
+        )
 
         # do it once
         oci_project = self.factory.makeOCIProject(pillar=distribution)
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
 
         # and then do it again
         oci_project2 = self.factory.makeOCIProject(pillar=distribution)
-        [git_ref2] = self.factory.makeGitRefs(
-            paths=['refs/heads/v3.0-20.04'])
+        [git_ref2] = self.factory.makeGitRefs(paths=["refs/heads/v3.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
         official_control = browser.getControl("Official recipe")
         official_control.selected = True
@@ -472,15 +544,17 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
         content = find_main_content(browser.contents)
         self.assertThat(
-            "Official recipe:\nYes",
-            MatchesTagText(content, "official-recipe"))
+            "Official recipe:\nYes", MatchesTagText(content, "official-recipe")
+        )
 
         browser2 = self.getViewBrowser(
-            oci_project2, view_name="+new-recipe", user=self.person)
+            oci_project2, view_name="+new-recipe", user=self.person
+        )
         browser2.getControl(name="field.name").value = "recipe-name"
         browser2.getControl("Description").value = "Recipe description"
-        browser2.getControl(name="field.git_ref.repository").value = (
-            git_ref2.repository.identity)
+        browser2.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref2.repository.identity
         browser2.getControl(name="field.git_ref.path").value = git_ref2.path
         official_control = browser2.getControl("Official recipe")
         official_control.selected = True
@@ -488,28 +562,30 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
         content = find_main_content(browser2.contents)
         self.assertThat(
-            "Official recipe:\nYes",
-            MatchesTagText(content, "official-recipe"))
+            "Official recipe:\nYes", MatchesTagText(content, "official-recipe")
+        )
 
         browser.reload()
         content = find_main_content(browser.contents)
         self.assertThat(
-            "Official recipe:\nYes",
-            MatchesTagText(content, "official-recipe"))
+            "Official recipe:\nYes", MatchesTagText(content, "official-recipe")
+        )
 
     def test_set_official_no_permissions(self):
         distro_owner = self.factory.makePerson()
         distribution = self.factory.makeDistribution(
-            oci_project_admin=distro_owner)
+            oci_project_admin=distro_owner
+        )
         oci_project = self.factory.makeOCIProject(pillar=distribution)
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = git_ref.path
         official_control = browser.getControl("Official recipe")
         official_control.selected = True
@@ -517,19 +593,21 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
         error_message = (
             "You do not have permission to set the official status "
-            "of this recipe.")
+            "of this recipe."
+        )
         self.assertIn(error_message, browser.contents)
 
     def test_create_recipe_doesnt_override_gitref_errors(self):
         oci_project = self.factory.makeOCIProject()
-        [git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v2.0-20.04"])
         browser = self.getViewBrowser(
-            oci_project, view_name="+new-recipe", user=self.person)
+            oci_project, view_name="+new-recipe", user=self.person
+        )
         browser.getControl(name="field.name").value = "recipe-name"
         browser.getControl("Description").value = "Recipe description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = "non-exist"
         browser.getControl("Create OCI recipe").click()
 
@@ -538,10 +616,9 @@ class TestOCIRecipeAddView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
 
 class TestOCIRecipeAdminView(BaseTestOCIRecipeView):
-
     def setUp(self):
         super().setUp()
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: "on"}))
 
     def test_unauthorized(self):
         # A non-admin user cannot administer an OCI recipe.
@@ -550,16 +627,21 @@ class TestOCIRecipeAdminView(BaseTestOCIRecipeView):
         recipe_url = canonical_url(recipe)
         browser = self.getViewBrowser(recipe, user=self.person)
         self.assertRaises(
-            LinkNotFoundError, browser.getLink, "Administer OCI recipe")
+            LinkNotFoundError, browser.getLink, "Administer OCI recipe"
+        )
         self.assertRaises(
-            Unauthorized, self.getUserBrowser, recipe_url + "/+admin",
-            user=self.person)
+            Unauthorized,
+            self.getUserBrowser,
+            recipe_url + "/+admin",
+            user=self.person,
+        )
 
     def test_admin_recipe(self):
         # Admins can change require_virtualized.
         login("[e-mail]")
         commercial_admin = self.factory.makePerson(
-            member_of=[getUtility(ILaunchpadCelebrities).commercial_admin])
+            member_of=[getUtility(ILaunchpadCelebrities).commercial_admin]
+        )
         login_person(self.person)
         recipe = self.factory.makeOCIRecipe(registrant=self.person)
         self.assertTrue(recipe.require_virtualized)
@@ -579,30 +661,36 @@ class TestOCIRecipeAdminView(BaseTestOCIRecipeView):
         # Administering an OCI recipe sets the date_last_modified property.
         login("[e-mail]")
         ppa_admin = self.factory.makePerson(
-            member_of=[getUtility(ILaunchpadCelebrities).ppa_admin])
+            member_of=[getUtility(ILaunchpadCelebrities).ppa_admin]
+        )
         login_person(self.person)
         date_created = datetime(2000, 1, 1, tzinfo=pytz.UTC)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, date_created=date_created)
+            registrant=self.person, date_created=date_created
+        )
         login_person(ppa_admin)
         view = OCIRecipeAdminView(recipe, LaunchpadTestRequest())
         view.initialize()
         view.request_action.success({"require_virtualized": False})
         self.assertSqlAttributeEqualsDate(
-            recipe, "date_last_modified", UTC_NOW)
+            recipe, "date_last_modified", UTC_NOW
+        )
 
 
 class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
-
     def setUp(self):
         super().setUp()
         self.distroseries = self.factory.makeDistroSeries()
         self.distribution = self.distroseries.distribution
-        self.useFixture(FeatureFixture({
-            OCI_RECIPE_ALLOW_CREATE: "on",
-            "oci.build_series.%s" % self.distribution.name:
-                self.distroseries.name,
-            }))
+        self.useFixture(
+            FeatureFixture(
+                {
+                    OCI_RECIPE_ALLOW_CREATE: "on",
+                    "oci.build_series.%s"
+                    % self.distribution.name: self.distroseries.name,
+                }
+            )
+        )
         self.setConfig()
 
     def setUpDistroSeries(self):
@@ -611,34 +699,45 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         for name in processor_names:
             processor = getUtility(IProcessorSet).getByName(name)
             self.factory.makeDistroArchSeries(
-                distroseries=self.distroseries, architecturetag=name,
-                processor=processor)
+                distroseries=self.distroseries,
+                architecturetag=name,
+                processor=processor,
+            )
 
     def assertRecipeProcessors(self, recipe, names):
         self.assertContentEqual(
-            names, [processor.name for processor in recipe.processors])
+            names, [processor.name for processor in recipe.processors]
+        )
 
     def assertProcessorControls(self, processors_control, enabled, disabled):
         matchers = [
             MatchesStructure.byEquality(optionValue=name, disabled=False)
-            for name in enabled]
-        matchers.extend([
-            MatchesStructure.byEquality(optionValue=name, disabled=True)
-            for name in disabled])
+            for name in enabled
+        ]
+        matchers.extend(
+            [
+                MatchesStructure.byEquality(optionValue=name, disabled=True)
+                for name in disabled
+            ]
+        )
         self.assertThat(processors_control.controls, MatchesSetwise(*matchers))
 
     def assertShowsPrivateBanner(self, browser):
         banners = find_tags_by_class(
-            browser.contents, "private_banner_container")
+            browser.contents, "private_banner_container"
+        )
         self.assertEqual(1, len(banners))
         self.assertEqual(
-            'The information on this page is private.',
-            extract_text(banners[0]))
+            "The information on this page is private.",
+            extract_text(banners[0]),
+        )
 
     def test_edit_private_recipe_shows_banner(self):
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            information_type=InformationType.USERDATA)
+            registrant=self.person,
+            owner=self.person,
+            information_type=InformationType.USERDATA,
+        )
         browser = self.getViewBrowser(recipe, user=self.person)
         browser.getLink("Edit OCI recipe").click()
         self.assertShowsPrivateBanner(browser)
@@ -647,14 +746,20 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         oci_project = self.factory.makeOCIProject()
         oci_project_display = oci_project.display_name
         [old_git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v1.0-20.04'])
+            paths=["refs/heads/v1.0-20.04"]
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, git_ref=old_git_ref)
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            git_ref=old_git_ref,
+        )
         self.factory.makeTeam(
-            name="new-team", displayname="New Team", members=[self.person])
+            name="new-team", displayname="New Team", members=[self.person]
+        )
         [new_git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v2.0-20.04'])
+            paths=["refs/heads/v2.0-20.04"]
+        )
         self.factory.makeOCIPushRule(recipe=recipe)
 
         browser = self.getViewBrowser(recipe, user=self.person)
@@ -662,8 +767,9 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         browser.getControl("Owner").value = ["new-team"]
         browser.getControl(name="field.name").value = "new-name"
         browser.getControl("Description").value = "New description"
-        browser.getControl(name="field.git_ref.repository").value = (
-            new_git_ref.repository.identity)
+        browser.getControl(
+            name="field.git_ref.repository"
+        ).value = new_git_ref.repository.identity
         browser.getControl(name="field.git_ref.path").value = new_git_ref.path
         browser.getControl("Build file path").value = "Dockerfile-2"
         browser.getControl("Build directory context").value = "apath"
@@ -675,32 +781,42 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         self.assertThat("New Team", MatchesPickerText(content, "edit-owner"))
         self.assertThat(
             "OCI project:\n%s" % oci_project_display,
-            MatchesTagText(content, "oci-project"))
+            MatchesTagText(content, "oci-project"),
+        )
         self.assertThat(
             "Source:\n%s\nEdit OCI recipe" % new_git_ref.display_name,
-            MatchesTagText(content, "source"))
+            MatchesTagText(content, "source"),
+        )
         self.assertThat(
             "Build file path:\nDockerfile-2\n"
             "Edit OCI recipe\n"
             "Build context directory:\napath\n"
             "Edit OCI recipe",
-            MatchesTagText(content, "build-file"))
+            MatchesTagText(content, "build-file"),
+        )
         self.assertThat(
             "Build schedule:\nBuilt daily\nEdit OCI recipe\n",
-            MatchesTagText(content, "build-schedule"))
+            MatchesTagText(content, "build-schedule"),
+        )
 
     def test_edit_recipe_invalid_branch(self):
         oci_project = self.factory.makeOCIProject()
         repository = self.factory.makeGitRepository()
         [old_git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v1.0-20.04'], repository=repository)
+            paths=["refs/heads/v1.0-20.04"], repository=repository
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, git_ref=old_git_ref)
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            git_ref=old_git_ref,
+        )
         self.factory.makeTeam(
-            name="new-team", displayname="New Team", members=[self.person])
+            name="new-team", displayname="New Team", members=[self.person]
+        )
         [new_git_ref] = self.factory.makeGitRefs(
-            repository=repository, paths=['refs/heads/invalid'])
+            repository=repository, paths=["refs/heads/invalid"]
+        )
         self.factory.makeOCIPushRule(recipe=recipe)
 
         browser = self.getViewBrowser(recipe, user=self.person)
@@ -713,25 +829,36 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         pillar = self.factory.makeProduct(
             owner=self.person,
             information_type=InformationType.PUBLIC,
-            branch_sharing_policy=BranchSharingPolicy.PUBLIC_OR_PROPRIETARY)
+            branch_sharing_policy=BranchSharingPolicy.PUBLIC_OR_PROPRIETARY,
+        )
         oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=pillar)
+            registrant=self.person, pillar=pillar
+        )
         [git_ref] = self.factory.makeGitRefs(
-            owner=self.person,
-            paths=['refs/heads/v2.0-20.04'])
+            owner=self.person, paths=["refs/heads/v2.0-20.04"]
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, git_ref=git_ref,
-            information_type=InformationType.PUBLIC)
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            git_ref=git_ref,
+            information_type=InformationType.PUBLIC,
+        )
 
-        browser = self.getViewBrowser(recipe, '+edit', user=self.person)
+        browser = self.getViewBrowser(recipe, "+edit", user=self.person)
 
         # Make sure we are showing all available information types:
         info_type_field = browser.getControl(name="field.information_type")
-        self.assertContentEqual([
-            'PUBLIC', 'PUBLICSECURITY', 'PRIVATESECURITY', 'USERDATA',
-            'PROPRIETARY'],
-            info_type_field.options)
+        self.assertContentEqual(
+            [
+                "PUBLIC",
+                "PUBLICSECURITY",
+                "PRIVATESECURITY",
+                "USERDATA",
+                "PROPRIETARY",
+            ],
+            info_type_field.options,
+        )
 
         info_type_field.value = InformationType.PROPRIETARY.name
         browser.getControl("Update OCI recipe").click()
@@ -739,39 +866,51 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
     def test_edit_recipe_on_public_pillar_information_types(self):
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person)
-        browser = self.getViewBrowser(recipe, '+edit', user=self.person)
+            registrant=self.person, owner=self.person
+        )
+        browser = self.getViewBrowser(recipe, "+edit", user=self.person)
 
         info_type_field = browser.getControl(name="field.information_type")
         self.assertContentEqual(
-            ['PUBLIC', 'PUBLICSECURITY', 'PRIVATESECURITY', 'USERDATA'],
-            info_type_field.options)
+            ["PUBLIC", "PUBLICSECURITY", "PRIVATESECURITY", "USERDATA"],
+            info_type_field.options,
+        )
 
     def test_edit_recipe_sets_date_last_modified(self):
         # Editing an OCI recipe sets the date_last_modified property.
         date_created = datetime(2000, 1, 1, tzinfo=pytz.UTC)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, date_created=date_created)
+            registrant=self.person, date_created=date_created
+        )
         with person_logged_in(self.person):
             view = OCIRecipeEditView(recipe, LaunchpadTestRequest())
             view.initialize()
-            view.request_action.success({
-                "owner": recipe.owner,
-                "name": "changed",
-                "description": "changed",
-                })
+            view.request_action.success(
+                {
+                    "owner": recipe.owner,
+                    "name": "changed",
+                    "description": "changed",
+                }
+            )
         self.assertSqlAttributeEqualsDate(
-            recipe, "date_last_modified", UTC_NOW)
+            recipe, "date_last_modified", UTC_NOW
+        )
 
     def test_edit_recipe_already_exists(self):
         oci_project = self.factory.makeOCIProject()
         oci_project_display = oci_project.display_name
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, name="one")
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            name="one",
+        )
         self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, name="two")
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            name="two",
+        )
         browser = self.getViewBrowser(recipe, user=self.person)
         browser.getLink("Edit OCI recipe").click()
         browser.getControl(name="field.name").value = "two"
@@ -779,29 +918,35 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         self.assertEqual(
             "There is already an OCI recipe owned by Test Person in %s with "
             "this name." % oci_project_display,
-            extract_text(find_tags_by_class(browser.contents, "message")[1]))
+            extract_text(find_tags_by_class(browser.contents, "message")[1]),
+        )
 
     def test_display_processors(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         processors = browser.getControl(name="field.processors")
         self.assertContentEqual(
             ["Intel 386 (386)", "AMD 64bit (amd64)", "HPPA Processor (hppa)"],
-            [extract_text(option) for option in processors.displayOptions])
+            [extract_text(option) for option in processors.displayOptions],
+        )
         self.assertContentEqual(["386", "amd64", "hppa"], processors.options)
 
     def test_edit_processors(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
         self.assertRecipeProcessors(recipe, ["386", "amd64", "hppa"])
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         processors = browser.getControl(name="field.processors")
         self.assertContentEqual(["386", "amd64", "hppa"], processors.value)
         processors.value = ["386", "amd64"]
@@ -813,10 +958,14 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, build_args={"VAR1": "xxx", "VAR2": "uu"})
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            build_args={"VAR1": "xxx", "VAR2": "uu"},
+        )
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         args = browser.getControl(name="field.build_args")
         self.assertContentEqual("VAR1=xxx\r\nVAR2=uu", args.value)
         args.value = "VAR=aa\nANOTHER_VAR=bbb"
@@ -824,16 +973,21 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         login_person(self.person)
         IStore(recipe).reload(recipe)
         self.assertEqual(
-            {"VAR": "aa", "ANOTHER_VAR": "bbb"}, recipe.build_args)
+            {"VAR": "aa", "ANOTHER_VAR": "bbb"}, recipe.build_args
+        )
 
     def test_edit_build_args_invalid_content(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project, build_args={"VAR1": "xxx", "VAR2": "uu"})
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            build_args={"VAR1": "xxx", "VAR2": "uu"},
+        )
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         args = browser.getControl(name="field.build_args")
         self.assertContentEqual("VAR1=xxx\r\nVAR2=uu", args.value)
         args.value = "VAR=aa\nmessed up text"
@@ -843,7 +997,8 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         content = find_main_content(browser.contents)
         self.assertIn(
             "'messed up text' at line 2 is not a valid KEY=value pair.",
-            extract_text(content))
+            extract_text(content),
+        )
 
         # Assert that recipe still have the original build_args.
         login_person(self.person)
@@ -859,11 +1014,14 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
             oci_project = self.factory.makeOCIProject(pillar=self.distribution)
             recipe = self.factory.makeOCIRecipe(
                 name=original_name,
-                registrant=self.person, owner=self.person,
-                oci_project=oci_project)
+                registrant=self.person,
+                owner=self.person,
+                oci_project=oci_project,
+            )
             oci_project.setOfficialRecipeStatus(recipe, True)
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         image_name = self.factory.getUniqueUnicode()
         field = browser.getControl(name="field.image_name")
         # Default is the recipe name
@@ -873,7 +1031,8 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         content = find_main_content(browser.contents)
         self.assertThat(
             "Registry image name:\n{}".format(image_name),
-            MatchesTagText(content, "image-name"))
+            MatchesTagText(content, "image-name"),
+        )
 
     def test_edit_with_invisible_processor(self):
         # It's possible for existing recipes to have an enabled processor
@@ -885,14 +1044,17 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         proc_386 = getUtility(IProcessorSet).getByName("386")
         proc_amd64 = getUtility(IProcessorSet).getByName("amd64")
         proc_armel = self.factory.makeProcessor(
-            name="armel", restricted=True, build_by_default=False)
+            name="armel", restricted=True, build_by_default=False
+        )
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
         recipe.setProcessors([proc_386, proc_amd64, proc_armel])
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         processors = browser.getControl(name="field.processors")
         self.assertContentEqual(["386", "amd64"], processors.value)
         processors.value = ["amd64"]
@@ -905,20 +1067,26 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         # checkbox in the UI, and the processor cannot be enabled.
         self.setUpDistroSeries()
         proc_armhf = self.factory.makeProcessor(
-            name="armhf", restricted=True, build_by_default=False)
+            name="armhf", restricted=True, build_by_default=False
+        )
         self.factory.makeDistroArchSeries(
-            distroseries=self.distroseries, architecturetag="armhf",
-            processor=proc_armhf)
+            distroseries=self.distroseries,
+            architecturetag="armhf",
+            processor=proc_armhf,
+        )
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
         self.assertRecipeProcessors(recipe, ["386", "amd64", "hppa"])
         browser = self.getViewBrowser(
-            recipe, view_name="+edit", user=recipe.owner)
+            recipe, view_name="+edit", user=recipe.owner
+        )
         processors = browser.getControl(name="field.processors")
         self.assertContentEqual(["386", "amd64", "hppa"], processors.value)
         self.assertProcessorControls(
-            processors, ["386", "amd64", "hppa"], ["armhf"])
+            processors, ["386", "amd64", "hppa"], ["armhf"]
+        )
         # Even if the user works around the disabled checkbox and forcibly
         # enables it, they can't enable the restricted processor.
         for control in processors.controls:
@@ -927,7 +1095,8 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         processors.value = ["386", "amd64", "armhf"]
         self.assertRaises(
             CannotModifyOCIRecipeProcessor,
-            browser.getControl("Update OCI recipe").click)
+            browser.getControl("Update OCI recipe").click,
+        )
 
     def test_edit_processors_restricted_already_enabled(self):
         # A restricted processor that is already enabled is shown with a
@@ -938,23 +1107,29 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
         proc_386 = getUtility(IProcessorSet).getByName("386")
         proc_amd64 = getUtility(IProcessorSet).getByName("amd64")
         proc_armhf = self.factory.makeProcessor(
-            name="armhf", restricted=True, build_by_default=False)
+            name="armhf", restricted=True, build_by_default=False
+        )
         self.setUpDistroSeries()
         self.factory.makeDistroArchSeries(
-            distroseries=self.distroseries, architecturetag="armhf",
-            processor=proc_armhf)
+            distroseries=self.distroseries,
+            architecturetag="armhf",
+            processor=proc_armhf,
+        )
         oci_project = self.factory.makeOCIProject(pillar=self.distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
         recipe.setProcessors([proc_386, proc_amd64, proc_armhf])
         self.assertRecipeProcessors(recipe, ["386", "amd64", "armhf"])
         browser = self.getUserBrowser(
-            canonical_url(recipe) + "/+edit", user=recipe.owner)
+            canonical_url(recipe) + "/+edit", user=recipe.owner
+        )
         processors = browser.getControl(name="field.processors")
         # armhf is checked but disabled.
         self.assertContentEqual(["386", "amd64", "armhf"], processors.value)
         self.assertProcessorControls(
-            processors, ["386", "amd64", "hppa"], ["armhf"])
+            processors, ["386", "amd64", "hppa"], ["armhf"]
+        )
         processors.value = ["386"]
         browser.getControl("Update OCI recipe").click()
         login_person(self.person)
@@ -963,93 +1138,126 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
     def test_edit_without_default_repo_for_ociproject(self):
         self.setUpDistroSeries()
         repo = self.factory.makeGitRepository(
-            owner=self.person, registrant=self.person)
+            owner=self.person, registrant=self.person
+        )
         [git_ref] = self.factory.makeGitRefs(
-            repository=repo, paths=['refs/heads/v1.0-20.04'])
+            repository=repo, paths=["refs/heads/v1.0-20.04"]
+        )
         oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=self.distribution)
+            registrant=self.person, pillar=self.distribution
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, oci_project=oci_project, git_ref=git_ref)
+            registrant=self.person, oci_project=oci_project, git_ref=git_ref
+        )
         with person_logged_in(self.person):
             oci_project_url = canonical_url(oci_project)
             browser = self.getViewBrowser(
-                recipe, view_name="+edit", user=self.person)
+                recipe, view_name="+edit", user=self.person
+            )
         error_message = (
             "This recipe's git repository is not in the correct "
             'namespace.<br/>Check the <a href="{url}">OCI project page</a> '
-            "for instructions on how to create it correctly.")
+            "for instructions on how to create it correctly."
+        )
         self.assertIn(
-            error_message.format(url=oci_project_url), browser.contents)
+            error_message.format(url=oci_project_url), browser.contents
+        )
 
     def test_edit_repository_is_not_default_for_ociproject(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=self.distribution)
+            registrant=self.person, pillar=self.distribution
+        )
         [random_git_ref] = self.factory.makeGitRefs(
-            paths=['refs/heads/v1.0-20.04'])
+            paths=["refs/heads/v1.0-20.04"]
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project,
-            git_ref=random_git_ref)
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            git_ref=random_git_ref,
+        )
 
         # Make the default git repository that should have been used by the
         # recipe.
         default_repo = self.factory.makeGitRepository(
             name=oci_project.name,
-            target=oci_project, owner=self.person, registrant=self.person)
+            target=oci_project,
+            owner=self.person,
+            registrant=self.person,
+        )
         with person_logged_in(self.distribution.owner):
             getUtility(IGitRepositorySet).setDefaultRepository(
-                oci_project, default_repo)
+                oci_project, default_repo
+            )
 
         with person_logged_in(self.person):
-            repo_link = GitRepositoryFormatterAPI(default_repo).link('')
+            repo_link = GitRepositoryFormatterAPI(default_repo).link("")
             browser = self.getViewBrowser(
-                recipe, view_name="+edit", user=self.person)
+                recipe, view_name="+edit", user=self.person
+            )
         error_message = (
             "This recipe's git repository is not in the correct "
-            "namespace.<br/>Consider using {repo} instead.")
-        self.assertIn(
-            error_message.format(repo=repo_link), browser.contents)
+            "namespace.<br/>Consider using {repo} instead."
+        )
+        self.assertIn(error_message.format(repo=repo_link), browser.contents)
 
     def test_edit_repository_in_the_correct_namespace(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=self.distribution)
+            registrant=self.person, pillar=self.distribution
+        )
         default_repo = self.factory.makeGitRepository(
             name=oci_project.name,
-            target=oci_project, owner=self.person, registrant=self.person)
+            target=oci_project,
+            owner=self.person,
+            registrant=self.person,
+        )
 
         [git_ref] = self.factory.makeGitRefs(
-            repository=default_repo, paths=['refs/heads/v1.0-20.04'])
+            repository=default_repo, paths=["refs/heads/v1.0-20.04"]
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project,
-            git_ref=git_ref)
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            git_ref=git_ref,
+        )
 
         with person_logged_in(self.person):
             browser = self.getViewBrowser(
-                recipe, view_name="+edit", user=self.person)
+                recipe, view_name="+edit", user=self.person
+            )
         self.assertNotIn(
             "This recipe's git repository is not in the correct namespace",
-            browser.contents)
+            browser.contents,
+        )
 
     def test_edit_repository_dont_override_important_msgs(self):
         self.setUpDistroSeries()
         oci_project = self.factory.makeOCIProject(
-            registrant=self.person, pillar=self.distribution)
+            registrant=self.person, pillar=self.distribution
+        )
 
-        [git_ref] = self.factory.makeGitRefs(paths=['refs/heads/v1.0-20.04'])
+        [git_ref] = self.factory.makeGitRefs(paths=["refs/heads/v1.0-20.04"])
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, oci_project=oci_project,
-            git_ref=git_ref)
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+            git_ref=git_ref,
+        )
 
         wrong_namespace_msg = (
-            "This recipe's git repository is not in the correct namespace")
+            "This recipe's git repository is not in the correct namespace"
+        )
         wrong_ref_path_msg = (
-                "The repository at %s does not contain a branch named "
-                "&#x27;non-existing git-ref&#x27;."
-            ) % git_ref.repository.display_name
+            "The repository at %s does not contain a branch named "
+            "&#x27;non-existing git-ref&#x27;."
+        ) % git_ref.repository.display_name
         with person_logged_in(self.person):
             browser = self.getViewBrowser(
-                recipe, view_name="+edit", user=self.person)
+                recipe, view_name="+edit", user=self.person
+            )
             self.assertIn(wrong_namespace_msg, browser.contents)
             args = browser.getControl(name="field.git_ref.path")
             args.value = "non-existing git-ref"
@@ -1062,8 +1270,8 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
     def test_official_is_disabled(self):
         oci_project = self.factory.makeOCIProject()
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
 
         browser = self.getViewBrowser(recipe, user=self.person)
         browser.getLink("Edit OCI recipe").click()
@@ -1072,12 +1280,13 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
     def test_official_is_set_while_disabled(self):
         distribution = self.factory.makeDistribution(
-            oci_project_admin=self.person)
+            oci_project_admin=self.person
+        )
         non_admin = self.factory.makePerson()
         oci_project = self.factory.makeOCIProject(pillar=distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=non_admin, owner=non_admin,
-            oci_project=oci_project)
+            registrant=non_admin, owner=non_admin, oci_project=oci_project
+        )
         with person_logged_in(self.person):
             oci_project.setOfficialRecipeStatus(recipe, True)
         browser = self.getViewBrowser(recipe, user=non_admin)
@@ -1088,11 +1297,12 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
     def test_official_is_enabled(self):
         distribution = self.factory.makeDistribution(
-            oci_project_admin=self.person)
+            oci_project_admin=self.person
+        )
         oci_project = self.factory.makeOCIProject(pillar=distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
 
         browser = self.getViewBrowser(recipe, user=self.person)
         browser.getLink("Edit OCI recipe").click()
@@ -1101,11 +1311,12 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
     def test_set_official(self):
         distribution = self.factory.makeDistribution(
-            oci_project_admin=self.person)
+            oci_project_admin=self.person
+        )
         oci_project = self.factory.makeOCIProject(pillar=distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
 
         browser = self.getViewBrowser(recipe, user=self.person)
         browser.getLink("Edit OCI recipe").click()
@@ -1115,17 +1326,18 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
         content = find_main_content(browser.contents)
         self.assertThat(
-            "Official recipe:\nYes",
-            MatchesTagText(content, "official-recipe"))
+            "Official recipe:\nYes", MatchesTagText(content, "official-recipe")
+        )
 
     def test_set_official_no_permissions(self):
         distro_owner = self.factory.makePerson()
         distribution = self.factory.makeDistribution(
-            oci_project_admin=distro_owner)
+            oci_project_admin=distro_owner
+        )
         oci_project = self.factory.makeOCIProject(pillar=distribution)
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            oci_project=oci_project)
+            registrant=self.person, owner=self.person, oci_project=oci_project
+        )
 
         browser = self.getViewBrowser(recipe, user=self.person)
         browser.getLink("Edit OCI recipe").click()
@@ -1135,33 +1347,39 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
 
         error_message = (
             "You do not have permission to change the official status "
-            "of this recipe.")
+            "of this recipe."
+        )
         self.assertIn(error_message, browser.contents)
 
 
 class TestOCIRecipeDeleteView(BaseTestOCIRecipeView):
-
     def setUp(self):
         super().setUp()
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: "on"}))
 
     def test_unauthorized(self):
         # A user without edit access cannot delete an OCI recipe.
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person)
+            registrant=self.person, owner=self.person
+        )
         recipe_url = canonical_url(recipe)
         other_person = self.factory.makePerson()
         browser = self.getViewBrowser(recipe, user=other_person)
         self.assertRaises(
-            LinkNotFoundError, browser.getLink, "Delete OCI recipe")
+            LinkNotFoundError, browser.getLink, "Delete OCI recipe"
+        )
         self.assertRaises(
-            Unauthorized, self.getUserBrowser, recipe_url + "/+delete",
-            user=other_person)
+            Unauthorized,
+            self.getUserBrowser,
+            recipe_url + "/+delete",
+            user=other_person,
+        )
 
     def test_delete_recipe_without_builds(self):
         # An OCI recipe without builds can be deleted.
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person)
+            registrant=self.person, owner=self.person
+        )
         recipe_url = canonical_url(recipe)
         oci_project_url = canonical_url(recipe.oci_project)
         browser = self.getViewBrowser(recipe, user=self.person)
@@ -1173,7 +1391,8 @@ class TestOCIRecipeDeleteView(BaseTestOCIRecipeView):
     def test_delete_recipe_with_builds(self):
         # An OCI recipe with builds can be deleted.
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person)
+            registrant=self.person, owner=self.person
+        )
         ocibuild = self.factory.makeOCIRecipeBuild(recipe=recipe)
         job = self.factory.makeOCIRecipeBuildJob(build=ocibuild)
         ocifile = self.factory.makeOCIFile(build=ocibuild)
@@ -1191,41 +1410,48 @@ class TestOCIRecipeDeleteView(BaseTestOCIRecipeView):
         self.assertRaises(NotFound, browser.open, recipe_url)
 
         # Checks that only the related artifacts were deleted too.
-        def obj_exists(obj, search_key='id'):
+        def obj_exists(obj, search_key="id"):
             obj = removeSecurityProxy(obj)
             store = IStore(obj)
             cls = obj.__class__
             cls_attribute = getattr(cls, search_key)
             identifier = getattr(obj, search_key)
             return not store.find(cls, cls_attribute == identifier).is_empty()
+
         self.assertFalse(obj_exists(ocibuild))
         self.assertFalse(obj_exists(ocifile))
-        self.assertFalse(obj_exists(job, 'job_id'))
+        self.assertFalse(obj_exists(job, "job_id"))
 
         self.assertTrue(obj_exists(unrelated_build))
         self.assertTrue(obj_exists(unrelated_file))
-        self.assertTrue(obj_exists(unrelated_job, 'job_id'))
+        self.assertTrue(obj_exists(unrelated_job, "job_id"))
 
 
 class TestOCIRecipeView(BaseTestOCIRecipeView):
-
     def setUp(self):
         super().setUp()
         self.distroseries = self.factory.makeDistroSeries()
         processor = getUtility(IProcessorSet).getByName("386")
         self.distroarchseries = self.factory.makeDistroArchSeries(
-            distroseries=self.distroseries, architecturetag="i386",
-            processor=processor)
+            distroseries=self.distroseries,
+            architecturetag="i386",
+            processor=processor,
+        )
         self.factory.makeBuilder(virtualized=True)
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: "on"}))
 
     def makeOCIRecipe(self, oci_project=None, **kwargs):
         if oci_project is None:
             oci_project = self.factory.makeOCIProject(
-                pillar=self.distroseries.distribution)
+                pillar=self.distroseries.distribution
+            )
         return self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person, name="recipe-name",
-            oci_project=oci_project, **kwargs)
+            registrant=self.person,
+            owner=self.person,
+            name="recipe-name",
+            oci_project=oci_project,
+            **kwargs,
+        )
 
     def makeBuild(self, recipe=None, date_created=None, **kwargs):
         if recipe is None:
@@ -1233,13 +1459,17 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
         if date_created is None:
             date_created = datetime.now(pytz.UTC) - timedelta(hours=1)
         return self.factory.makeOCIRecipeBuild(
-            requester=self.person, recipe=recipe,
+            requester=self.person,
+            recipe=recipe,
             distro_arch_series=self.distroarchseries,
-            date_created=date_created, **kwargs)
+            date_created=date_created,
+            **kwargs,
+        )
 
     def test_breadcrumb_and_top_header(self):
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         oci_project_name = oci_project.name
         oci_project_url = canonical_url(oci_project)
         pillar_name = oci_project.pillar.name
@@ -1251,7 +1481,8 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
         view.initialize()
         content = view()
         breadcrumbs = soupmatchers.Tag(
-            "breadcrumbs", "ol", attrs={"class": "breadcrumbs"})
+            "breadcrumbs", "ol", attrs={"class": "breadcrumbs"}
+        )
 
         # Should not have a breadcrumbs (OCI project link should be at the
         # top of the page, close to project/distribution name).
@@ -1259,27 +1490,50 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
         # OCI project should appear at the top header, right after pillar link.
         header = soupmatchers.Tag(
-            "subtitle", "h2", attrs={"id": "watermark-heading"})
-        self.assertThat(content, soupmatchers.HTMLContains(soupmatchers.Within(
-            header, soupmatchers.Tag(
-                "pillar link", "a",
-                text=pillar_name.title(), attrs={"href": pillar_url}))))
-        self.assertThat(content, soupmatchers.HTMLContains(soupmatchers.Within(
-            header, soupmatchers.Tag(
-                    "OCI project link", "a",
-                    text="%s OCI project" % oci_project_name,
-                    attrs={"href": oci_project_url}))))
+            "subtitle", "h2", attrs={"id": "watermark-heading"}
+        )
+        self.assertThat(
+            content,
+            soupmatchers.HTMLContains(
+                soupmatchers.Within(
+                    header,
+                    soupmatchers.Tag(
+                        "pillar link",
+                        "a",
+                        text=pillar_name.title(),
+                        attrs={"href": pillar_url},
+                    ),
+                )
+            ),
+        )
+        self.assertThat(
+            content,
+            soupmatchers.HTMLContains(
+                soupmatchers.Within(
+                    header,
+                    soupmatchers.Tag(
+                        "OCI project link",
+                        "a",
+                        text="%s OCI project" % oci_project_name,
+                        attrs={"href": oci_project_url},
+                    ),
+                )
+            ),
+        )
 
     def makeRecipe(self, processor_names, **kwargs):
         recipe = self.factory.makeOCIRecipe(**kwargs)
         processors_list = []
         distroseries = self.factory.makeDistroSeries(
-            distribution=recipe.oci_project.distribution)
+            distribution=recipe.oci_project.distribution
+        )
         for proc_name in processor_names:
             proc = getUtility(IProcessorSet).getByName(proc_name)
             distro = self.factory.makeDistroArchSeries(
-                distroseries=distroseries, architecturetag=proc_name,
-                processor=proc)
+                distroseries=distroseries,
+                architecturetag=proc_name,
+                processor=proc,
+            )
             distro.addOrUpdateChroot(self.factory.makeLibraryFileAlias())
             processors_list.append(proc)
         recipe.setProcessors(processors_list)
@@ -1287,15 +1541,23 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
     def test_index(self):
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         oci_project_display = oci_project.display_name
         [ref] = self.factory.makeGitRefs(
-            owner=self.person, target=self.person, name="recipe-repository",
-            paths=["refs/heads/v1.0-20.04"])
+            owner=self.person,
+            target=self.person,
+            name="recipe-repository",
+            paths=["refs/heads/v1.0-20.04"],
+        )
         recipe = self.makeRecipe(
             processor_names=["amd64", "386"],
-            build_file="Dockerfile", git_ref=ref,
-            oci_project=oci_project, registrant=self.person, owner=self.person)
+            build_file="Dockerfile",
+            git_ref=ref,
+            oci_project=oci_project,
+            registrant=self.person,
+            owner=self.person,
+        )
         build_request = recipe.requestBuilds(self.person)
         builds = recipe.requestBuildsFromJob(self.person, build_request)
         job = removeSecurityProxy(build_request).job
@@ -1303,20 +1565,27 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
         for build in builds:
             removeSecurityProxy(build).updateStatus(
-                    BuildStatus.BUILDING, builder=None,
-                    date_started=build.date_created)
+                BuildStatus.BUILDING,
+                builder=None,
+                date_started=build.date_created,
+            )
             removeSecurityProxy(build).updateStatus(
-                BuildStatus.FULLYBUILT, builder=None,
-                date_finished=build.date_started + timedelta(minutes=30))
+                BuildStatus.FULLYBUILT,
+                builder=None,
+                date_finished=build.date_started + timedelta(minutes=30),
+            )
 
         # We also need to account for builds that don't have a build_request
         build = self.makeBuild(
-            recipe=recipe, status=BuildStatus.FULLYBUILT,
-            duration=timedelta(minutes=30))
+            recipe=recipe,
+            status=BuildStatus.FULLYBUILT,
+            duration=timedelta(minutes=30),
+        )
 
         browser = self.getViewBrowser(build_request.recipe)
         login_person(self.person)
-        self.assertTextMatchesExpressionIgnoreWhitespace("""\
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            """\
             .*
             OCI recipe information
             Owner: Test Person
@@ -1354,26 +1623,37 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             30 minutes ago
             Recipe push rules
             This OCI recipe has no push rules defined yet.
-            """ % (oci_project_display, recipe.build_path),
-            extract_text(find_main_content(browser.contents)))
+            """
+            % (oci_project_display, recipe.build_path),
+            extract_text(find_main_content(browser.contents)),
+        )
 
         # Check portlet on side menu.
         privacy_tag = find_tag_by_id(browser.contents, "privacy")
         self.assertTextMatchesExpressionIgnoreWhitespace(
             "This OCI recipe contains Public information",
-            extract_text(privacy_tag))
+            extract_text(privacy_tag),
+        )
 
     def test_index_cancelled_build(self):
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         oci_project_display = oci_project.display_name
         [ref] = self.factory.makeGitRefs(
-            owner=self.person, target=self.person, name="recipe-repository",
-            paths=["refs/heads/v1.0-20.04"])
+            owner=self.person,
+            target=self.person,
+            name="recipe-repository",
+            paths=["refs/heads/v1.0-20.04"],
+        )
         recipe = self.makeRecipe(
             processor_names=["amd64", "386"],
-            build_file="Dockerfile", git_ref=ref,
-            oci_project=oci_project, registrant=self.person, owner=self.person)
+            build_file="Dockerfile",
+            git_ref=ref,
+            oci_project=oci_project,
+            registrant=self.person,
+            owner=self.person,
+        )
         build_request = recipe.requestBuilds(self.person)
         builds = recipe.requestBuildsFromJob(self.person, build_request)
         job = removeSecurityProxy(build_request).job
@@ -1381,20 +1661,27 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
         for build in builds:
             removeSecurityProxy(build).updateStatus(
-                    BuildStatus.BUILDING, builder=None,
-                    date_started=build.date_created)
+                BuildStatus.BUILDING,
+                builder=None,
+                date_started=build.date_created,
+            )
             removeSecurityProxy(build).updateStatus(
-                BuildStatus.CANCELLED, builder=None,
-                date_finished=build.date_started + timedelta(minutes=30))
+                BuildStatus.CANCELLED,
+                builder=None,
+                date_finished=build.date_started + timedelta(minutes=30),
+            )
 
         # We also need to account for builds that don't have a build_request
         build = self.makeBuild(
-            recipe=recipe, status=BuildStatus.FULLYBUILT,
-            duration=timedelta(minutes=30))
+            recipe=recipe,
+            status=BuildStatus.FULLYBUILT,
+            duration=timedelta(minutes=30),
+        )
 
         browser = self.getViewBrowser(build_request.recipe)
         login_person(self.person)
-        self.assertTextMatchesExpressionIgnoreWhitespace("""\
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            """\
             .*
             OCI recipe information
             Owner: Test Person
@@ -1432,25 +1719,36 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             30 minutes ago
             Recipe push rules
             This OCI recipe has no push rules defined yet.
-            """ % (oci_project_display, recipe.build_path),
-            extract_text(find_main_content(browser.contents)))
+            """
+            % (oci_project_display, recipe.build_path),
+            extract_text(find_main_content(browser.contents)),
+        )
 
         # Check portlet on side menu.
         privacy_tag = find_tag_by_id(browser.contents, "privacy")
         self.assertTextMatchesExpressionIgnoreWhitespace(
             "This OCI recipe contains Public information",
-            extract_text(privacy_tag))
+            extract_text(privacy_tag),
+        )
 
     def test_index_cancelling_build(self):
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         [ref] = self.factory.makeGitRefs(
-            owner=self.person, target=self.person, name="recipe-repository",
-            paths=["refs/heads/v1.0-20.04"])
+            owner=self.person,
+            target=self.person,
+            name="recipe-repository",
+            paths=["refs/heads/v1.0-20.04"],
+        )
         recipe = self.makeRecipe(
             processor_names=["amd64", "386"],
-            build_file="Dockerfile", git_ref=ref,
-            oci_project=oci_project, registrant=self.person, owner=self.person)
+            build_file="Dockerfile",
+            git_ref=ref,
+            oci_project=oci_project,
+            registrant=self.person,
+            owner=self.person,
+        )
         build_request = recipe.requestBuilds(self.person)
         builds = recipe.requestBuildsFromJob(self.person, build_request)
         job = removeSecurityProxy(build_request).job
@@ -1458,15 +1756,20 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
         for build in builds:
             removeSecurityProxy(build).updateStatus(
-                    BuildStatus.BUILDING, builder=None,
-                    date_started=build.date_created)
+                BuildStatus.BUILDING,
+                builder=None,
+                date_started=build.date_created,
+            )
             removeSecurityProxy(build).updateStatus(
-                BuildStatus.CANCELLING, builder=None,
-                date_finished=build.date_started + timedelta(minutes=30))
+                BuildStatus.CANCELLING,
+                builder=None,
+                date_finished=build.date_started + timedelta(minutes=30),
+            )
 
         browser = self.getViewBrowser(build_request.recipe)
         login_person(self.person)
-        self.assertTextMatchesExpressionIgnoreWhitespace("""\
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            """\
             .*
             There were build failures.
             No registry upload requested.
@@ -1483,49 +1786,66 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             \\(estimated\\)
             .*
             """,
-            extract_text(find_main_content(browser.contents)))
+            extract_text(find_main_content(browser.contents)),
+        )
 
         # Check portlet on side menu.
         privacy_tag = find_tag_by_id(browser.contents, "privacy")
         self.assertTextMatchesExpressionIgnoreWhitespace(
             "This OCI recipe contains Public information",
-            extract_text(privacy_tag))
+            extract_text(privacy_tag),
+        )
 
     def test_index_for_private_recipe_shows_banner(self):
         recipe = self.factory.makeOCIRecipe(
-            registrant=self.person, owner=self.person,
-            information_type=InformationType.USERDATA)
+            registrant=self.person,
+            owner=self.person,
+            information_type=InformationType.USERDATA,
+        )
         browser = self.getViewBrowser(recipe, user=self.person)
 
         # Check top banner.
         banners = find_tags_by_class(
-            browser.contents, "private_banner_container")
+            browser.contents, "private_banner_container"
+        )
         self.assertEqual(1, len(banners))
         self.assertTextMatchesExpressionIgnoreWhitespace(
-            'The information on this page is private.',
-            extract_text(banners[0]))
+            "The information on this page is private.",
+            extract_text(banners[0]),
+        )
 
         # Check portlet on side menu.
         privacy_tag = find_tag_by_id(browser.contents, "privacy")
         self.assertTextMatchesExpressionIgnoreWhitespace(
             "This OCI recipe contains Private information",
-            extract_text(privacy_tag))
+            extract_text(privacy_tag),
+        )
 
     def test_index_with_build_args(self):
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         oci_project_display = oci_project.display_name
         [ref] = self.factory.makeGitRefs(
-            owner=self.person, target=self.person, name="recipe-repository",
-            paths=["refs/heads/v1.0-20.04"])
+            owner=self.person,
+            target=self.person,
+            name="recipe-repository",
+            paths=["refs/heads/v1.0-20.04"],
+        )
         recipe = self.makeOCIRecipe(
-            oci_project=oci_project, git_ref=ref, build_file="Dockerfile",
-            build_args={"VAR1": "123", "VAR2": "XXX"})
+            oci_project=oci_project,
+            git_ref=ref,
+            build_file="Dockerfile",
+            build_args={"VAR1": "123", "VAR2": "XXX"},
+        )
         build_path = recipe.build_path
         build = self.makeBuild(
-            recipe=recipe, status=BuildStatus.FULLYBUILT,
-            duration=timedelta(minutes=30))
-        self.assertTextMatchesExpressionIgnoreWhitespace("""\
+            recipe=recipe,
+            status=BuildStatus.FULLYBUILT,
+            duration=timedelta(minutes=30),
+        )
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            """\
             recipe-name
             .*
             OCI recipe information
@@ -1551,25 +1871,36 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             Successfully built
             386
             30 minutes ago
-            """ % (oci_project_display, build_path),
-            self.getMainText(build.recipe))
+            """
+            % (oci_project_display, build_path),
+            self.getMainText(build.recipe),
+        )
 
     def test_index_for_subscriber_without_git_repo_access(self):
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         oci_project_display = oci_project.display_name
         [ref] = self.factory.makeGitRefs(
-            owner=self.person, target=self.person, name="recipe-repository",
+            owner=self.person,
+            target=self.person,
+            name="recipe-repository",
             paths=["refs/heads/v1.0-20.04"],
-            information_type=InformationType.PRIVATESECURITY)
+            information_type=InformationType.PRIVATESECURITY,
+        )
         recipe = self.makeOCIRecipe(
-            oci_project=oci_project, git_ref=ref, build_file="Dockerfile",
-            information_type=InformationType.PRIVATESECURITY)
+            oci_project=oci_project,
+            git_ref=ref,
+            build_file="Dockerfile",
+            information_type=InformationType.PRIVATESECURITY,
+        )
         with admin_logged_in():
             build_path = recipe.build_path
             self.makeBuild(
-                recipe=recipe, status=BuildStatus.FULLYBUILT,
-                duration=timedelta(minutes=30))
+                recipe=recipe,
+                status=BuildStatus.FULLYBUILT,
+                duration=timedelta(minutes=30),
+            )
 
         # Subscribe a user.
         subscriber = self.factory.makePerson()
@@ -1578,7 +1909,8 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
         with person_logged_in(subscriber):
             main_text = self.getMainText(recipe, user=subscriber)
-        self.assertTextMatchesExpressionIgnoreWhitespace("""\
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            """\
             recipe-name
             .*
             OCI recipe information
@@ -1603,15 +1935,19 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             Successfully built
             386
             30 minutes ago
-            """ % (oci_project_display, build_path),
-            main_text)
+            """
+            % (oci_project_display, build_path),
+            main_text,
+        )
 
     def test_index_success_with_buildlog(self):
         # The build log is shown if it is there.
         build = self.makeBuild(
-            status=BuildStatus.FULLYBUILT, duration=timedelta(minutes=30))
+            status=BuildStatus.FULLYBUILT, duration=timedelta(minutes=30)
+        )
         build.setLog(self.factory.makeLibraryFileAlias())
-        self.assertTextMatchesExpressionIgnoreWhitespace(r"""\
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            r"""\
             Latest builds
             Build status
             Upload status
@@ -1627,31 +1963,42 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             Successfully built
             386
             30 minutes ago
-            """, self.getMainText(build.recipe))
+            """,
+            self.getMainText(build.recipe),
+        )
 
     def test_index_no_builds(self):
         # A message is shown when there are no builds.
         recipe = self.factory.makeOCIRecipe()
         self.assertIn(
-            "This OCI recipe has not been built yet.",
-            self.getMainText(recipe))
+            "This OCI recipe has not been built yet.", self.getMainText(recipe)
+        )
 
     def test_index_pending_build(self):
         # A pending build is listed as such.
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution)
+            pillar=self.distroseries.distribution
+        )
         [ref] = self.factory.makeGitRefs(
-            owner=self.person, target=self.person, name="recipe-repository",
-            paths=["refs/heads/v1.0-20.04"])
+            owner=self.person,
+            target=self.person,
+            name="recipe-repository",
+            paths=["refs/heads/v1.0-20.04"],
+        )
         recipe = self.makeRecipe(
             processor_names=["amd64", "386"],
-            build_file="Dockerfile", git_ref=ref,
-            oci_project=oci_project, registrant=self.person, owner=self.person)
+            build_file="Dockerfile",
+            git_ref=ref,
+            oci_project=oci_project,
+            registrant=self.person,
+            owner=self.person,
+        )
         build_request = recipe.requestBuilds(self.person)
         builds = recipe.requestBuildsFromJob(self.person, build_request)
         job = removeSecurityProxy(build_request).job
         removeSecurityProxy(job).builds = builds
-        self.assertTextMatchesExpressionIgnoreWhitespace(r"""\
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            r"""\
             Latest builds
             Build status
             Upload status
@@ -1661,16 +2008,20 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             Waiting for builds to start.
             a moment ago
             in .* \(estimated\)
-            """, self.getMainText(recipe))
+            """,
+            self.getMainText(recipe),
+        )
 
     def test_index_request_builds_link(self):
         # Recipe owners get a link to allow requesting builds.
         owner = self.factory.makePerson()
         distroseries = self.factory.makeDistroSeries()
         oci_project = self.factory.makeOCIProject(
-            pillar=distroseries.distribution)
+            pillar=distroseries.distribution
+        )
         recipe = self.factory.makeOCIRecipe(
-            registrant=owner, owner=owner, oci_project=oci_project)
+            registrant=owner, owner=owner, oci_project=oci_project
+        )
         recipe_name = recipe.name
         browser = self.getViewBrowser(recipe, user=owner)
         browser.getLink("Request builds").click()
@@ -1681,30 +2032,38 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
         # requesting builds.
         distroseries = self.factory.makeDistroSeries()
         oci_project = self.factory.makeOCIProject(
-            pillar=distroseries.distribution)
+            pillar=distroseries.distribution
+        )
         recipe = self.factory.makeOCIRecipe(oci_project=oci_project)
         recipe_url = canonical_url(recipe)
         browser = self.getViewBrowser(recipe, user=self.person)
         self.assertRaises(LinkNotFoundError, browser.getLink, "Request builds")
         self.assertRaises(
-            Unauthorized, self.getUserBrowser, recipe_url + "/+request-builds",
-            user=self.person)
+            Unauthorized,
+            self.getUserBrowser,
+            recipe_url + "/+request-builds",
+            user=self.person,
+        )
 
     def setStatus(self, build, status):
         build.updateStatus(
-            BuildStatus.BUILDING, date_started=build.date_created)
+            BuildStatus.BUILDING, date_started=build.date_created
+        )
         build.updateStatus(
-            status, date_finished=build.date_started + timedelta(minutes=30))
+            status, date_finished=build.date_started + timedelta(minutes=30)
+        )
 
     def test_builds(self):
         # OCIRecipeView.builds produces reasonable results.
         recipe = self.makeOCIRecipe()
         # Create oldest builds first so that they sort properly by id.
         date_gen = time_counter(
-            datetime(2000, 1, 1, tzinfo=pytz.UTC), timedelta(days=1))
+            datetime(2000, 1, 1, tzinfo=pytz.UTC), timedelta(days=1)
+        )
         builds = [
             self.makeBuild(recipe=recipe, date_created=next(date_gen))
-            for i in range(11)]
+            for i in range(11)
+        ]
         view = OCIRecipeView(recipe, None)
         self.assertEqual(list(reversed(builds)), view.builds)
         self.setStatus(builds[10], BuildStatus.FULLYBUILT)
@@ -1713,7 +2072,8 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
         # When there are >= 9 pending builds, only the most recent of any
         # completed builds is returned.
         self.assertEqual(
-            list(reversed(builds[:9])) + [builds[10]], view.builds)
+            list(reversed(builds[:9])) + [builds[10]], view.builds
+        )
         for build in builds[:9]:
             self.setStatus(build, BuildStatus.FULLYBUILT)
         del get_property_cache(view).builds
@@ -1721,34 +2081,46 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
 
 
 class TestOCIRecipeRequestBuildsView(BaseTestOCIRecipeView):
-
     def setUp(self):
         super().setUp()
         self.ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
         self.distroseries = self.factory.makeDistroSeries(
-            distribution=self.ubuntu, name="shiny", displayname="Shiny")
+            distribution=self.ubuntu, name="shiny", displayname="Shiny"
+        )
+        distribution = self.distroseries.distribution
         self.architectures = []
         for processor, architecture in ("386", "i386"), ("amd64", "amd64"):
             das = self.factory.makeDistroArchSeries(
-                distroseries=self.distroseries, architecturetag=architecture,
-                processor=getUtility(IProcessorSet).getByName(processor))
+                distroseries=self.distroseries,
+                architecturetag=architecture,
+                processor=getUtility(IProcessorSet).getByName(processor),
+            )
             das.addOrUpdateChroot(self.factory.makeLibraryFileAlias())
             self.architectures.append(das)
-        self.useFixture(FeatureFixture({
-            OCI_RECIPE_ALLOW_CREATE: "on",
-            "oci.build_series.%s" % self.distroseries.distribution.name:
-                self.distroseries.name,
-            }))
+        self.useFixture(
+            FeatureFixture(
+                {
+                    OCI_RECIPE_ALLOW_CREATE: "on",
+                    "oci.build_series.%s"
+                    % distribution.name: self.distroseries.name,
+                }
+            )
+        )
         oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution,
-            ociprojectname="oci-project-name")
+            pillar=distribution,
+            ociprojectname="oci-project-name",
+        )
         self.recipe = self.factory.makeOCIRecipe(
-            name="recipe-name", registrant=self.person, owner=self.person,
-            oci_project=oci_project)
+            name="recipe-name",
+            registrant=self.person,
+            owner=self.person,
+            oci_project=oci_project,
+        )
 
     def test_request_builds_page(self):
         # The +request-builds page is sane.
-        self.assertTextMatchesExpressionIgnoreWhitespace("""
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            """
             Request builds for recipe-name
             recipe-name
             Request builds
@@ -1758,12 +2130,14 @@ class TestOCIRecipeRequestBuildsView(BaseTestOCIRecipeView):
             or
             Cancel
             """,
-            self.getMainText(self.recipe, "+request-builds", user=self.person))
+            self.getMainText(self.recipe, "+request-builds", user=self.person),
+        )
 
     def test_request_builds_not_owner(self):
         # A user without launchpad.Edit cannot request builds.
         self.assertRaises(
-            Unauthorized, self.getViewBrowser, self.recipe, "+request-builds")
+            Unauthorized, self.getViewBrowser, self.recipe, "+request-builds"
+        )
 
     def runRequestBuildJobs(self):
         with admin_logged_in():
@@ -1774,7 +2148,8 @@ class TestOCIRecipeRequestBuildsView(BaseTestOCIRecipeView):
     def test_request_builds_action(self):
         # Requesting a build creates pending builds.
         browser = self.getViewBrowser(
-            self.recipe, "+request-builds", user=self.person)
+            self.recipe, "+request-builds", user=self.person
+        )
         self.assertTrue(browser.getControl("amd64").selected)
         self.assertTrue(browser.getControl("i386").selected)
         browser.getControl("Request builds").click()
@@ -1785,146 +2160,206 @@ class TestOCIRecipeRequestBuildsView(BaseTestOCIRecipeView):
         builds = self.recipe.pending_builds
         self.assertContentEqual(
             ["amd64", "i386"],
-            [build.distro_arch_series.architecturetag for build in builds])
+            [build.distro_arch_series.architecturetag for build in builds],
+        )
         self.assertContentEqual(
-            [2510], {build.buildqueue_record.lastscore for build in builds})
+            [2510], {build.buildqueue_record.lastscore for build in builds}
+        )
 
     def test_request_builds_no_architectures(self):
         # Selecting no architectures causes a validation failure.
         browser = self.getViewBrowser(
-            self.recipe, "+request-builds", user=self.person)
+            self.recipe, "+request-builds", user=self.person
+        )
         browser.getControl("amd64").selected = False
         browser.getControl("i386").selected = False
         browser.getControl("Request builds").click()
         self.assertIn(
             "You need to select at least one architecture.",
-            extract_text(find_main_content(browser.contents)))
+            extract_text(find_main_content(browser.contents)),
+        )
 
 
-class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
-                                     BaseTestOCIRecipeView):
+class TestOCIRecipeEditPushRulesView(
+    OCIConfigHelperMixin, BaseTestOCIRecipeView
+):
     def setUp(self):
         super().setUp()
         self.ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
         self.distroseries = self.factory.makeDistroSeries(
-            distribution=self.ubuntu, name="shiny", displayname="Shiny")
-
-        self.useFixture(FeatureFixture({
-            OCI_RECIPE_ALLOW_CREATE: "on",
-            "oci.build_series.%s" % self.distroseries.distribution.name:
-                self.distroseries.name,
-        }))
+            distribution=self.ubuntu, name="shiny", displayname="Shiny"
+        )
+        distribution = self.distroseries.distribution
+
+        self.useFixture(
+            FeatureFixture(
+                {
+                    OCI_RECIPE_ALLOW_CREATE: "on",
+                    "oci.build_series.%s"
+                    % distribution.name: self.distroseries.name,
+                }
+            )
+        )
         self.oci_project = self.factory.makeOCIProject(
-            pillar=self.distroseries.distribution,
-            ociprojectname="oci-project-name")
+            pillar=distribution,
+            ociprojectname="oci-project-name",
+        )
 
         self.member = self.factory.makePerson()
         self.team = self.factory.makeTeam(members=[self.person, self.member])
 
         self.recipe = self.factory.makeOCIRecipe(
-            name="recipe-name", registrant=self.person, owner=self.person,
-            oci_project=self.oci_project)
+            name="recipe-name",
+            registrant=self.person,
+            owner=self.person,
+            oci_project=self.oci_project,
+        )
 
         self.team_owned_recipe = self.factory.makeOCIRecipe(
-            name="recipe-name", registrant=self.person, owner=self.team,
-            oci_project=self.oci_project)
+            name="recipe-name",
+            registrant=self.person,
+            owner=self.team,
+            oci_project=self.oci_project,
+        )
 
         self.setConfig()
 
     def test_view_oci_push_rules_owner(self):
         url = self.factory.getUniqueURL()
-        credentials = {'username': 'foo', 'password': 'bar'}
+        credentials = {"username": "foo", "password": "bar"}
         registry_credentials = getUtility(IOCIRegistryCredentialsSet).new(
-            registrant=self.person, owner=self.person, url=url,
-            credentials=credentials)
+            registrant=self.person,
+            owner=self.person,
+            url=url,
+            credentials=credentials,
+        )
         image_name = self.factory.getUniqueUnicode()
         push_rule = getUtility(IOCIPushRuleSet).new(
             recipe=self.recipe,
             registry_credentials=registry_credentials,
-            image_name=image_name)
+            image_name=image_name,
+        )
         view = create_initialized_view(
-                self.recipe, "+index", principal=self.person)
+            self.recipe, "+index", principal=self.person
+        )
 
         # Display the Registry URL and the Username
         # for the credentials owner
         with person_logged_in(self.person):
             rendered_view = view.render()
-            row = soupmatchers.Tag("push rule row", "tr",
-                                   attrs={"id": "rule-%d" % push_rule.id})
-            self.assertThat(rendered_view, soupmatchers.HTMLContains(
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Registry URL", "td",
-                                     text=registry_credentials.url)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Username", "td",
-                                     text=registry_credentials.username)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag(
-                        "Image name", "td", text=image_name))))
+            row = soupmatchers.Tag(
+                "push rule row", "tr", attrs={"id": "rule-%d" % push_rule.id}
+            )
+            self.assertThat(
+                rendered_view,
+                soupmatchers.HTMLContains(
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Registry URL", "td", text=registry_credentials.url
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Username",
+                            "td",
+                            text=registry_credentials.username,
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag("Image name", "td", text=image_name),
+                    ),
+                ),
+            )
 
     def test_view_oci_push_rules_non_owner(self):
         url = self.factory.getUniqueURL()
-        credentials = {'username': 'foo', 'password': 'bar'}
+        credentials = {"username": "foo", "password": "bar"}
         registry_credentials = getUtility(IOCIRegistryCredentialsSet).new(
-            registrant=self.person, owner=self.person, url=url,
-            credentials=credentials)
+            registrant=self.person,
+            owner=self.person,
+            url=url,
+            credentials=credentials,
+        )
         image_name = self.factory.getUniqueUnicode()
         push_rule = getUtility(IOCIPushRuleSet).new(
             recipe=self.recipe,
             registry_credentials=registry_credentials,
-            image_name=image_name)
+            image_name=image_name,
+        )
         non_owner = self.factory.makePerson()
         admin = self.factory.makePerson(
-            member_of=[getUtility(IPersonSet).getByName('admins')])
+            member_of=[getUtility(IPersonSet).getByName("admins")]
+        )
         view = create_initialized_view(
-                self.recipe, "+index", principal=non_owner)
+            self.recipe, "+index", principal=non_owner
+        )
 
         # Display only the image name for users
         # who are not the registry credentials owner
         with person_logged_in(non_owner):
             rendered_view = view.render()
-            row = soupmatchers.Tag("push rule row", "tr",
-                                   attrs={"id": "rule-%d" % push_rule.id})
-            self.assertThat(rendered_view, soupmatchers.HTMLContains(
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Registry URL", "td",
-                                     text=soupmatchers._not_passed)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Username", "td",
-                                     text=soupmatchers._not_passed)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag(
-                        "Image name", "td", text=image_name))))
+            row = soupmatchers.Tag(
+                "push rule row", "tr", attrs={"id": "rule-%d" % push_rule.id}
+            )
+            self.assertThat(
+                rendered_view,
+                soupmatchers.HTMLContains(
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Registry URL", "td", text=soupmatchers._not_passed
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Username", "td", text=soupmatchers._not_passed
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag("Image name", "td", text=image_name),
+                    ),
+                ),
+            )
 
         # Anonymous users can't see registry credentials
         # even though they can see the push rule
         with anonymous_logged_in():
             rendered_view = view.render()
-            row = soupmatchers.Tag("push rule row", "tr",
-                                   attrs={"id": "rule-%d" % push_rule.id})
-            self.assertThat(rendered_view, soupmatchers.HTMLContains(
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Registry URL", "td",
-                                     text=soupmatchers._not_passed)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Region", "td",
-                                     text=soupmatchers._not_passed)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Username", "td",
-                                     text=soupmatchers._not_passed)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag(
-                        "Image name", "td", text=image_name))))
+            row = soupmatchers.Tag(
+                "push rule row", "tr", attrs={"id": "rule-%d" % push_rule.id}
+            )
+            self.assertThat(
+                rendered_view,
+                soupmatchers.HTMLContains(
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Registry URL", "td", text=soupmatchers._not_passed
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Region", "td", text=soupmatchers._not_passed
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Username", "td", text=soupmatchers._not_passed
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag("Image name", "td", text=image_name),
+                    ),
+                ),
+            )
 
         # Although not the owner of the registry credentials
         # the admin user has launchpad.View permission on
@@ -1933,56 +2368,76 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         # see ViewOCIRegistryCredentials
         with person_logged_in(admin):
             rendered_view = view.render()
-            row = soupmatchers.Tag("push rule row", "tr",
-                                   attrs={"id": "rule-%d" % push_rule.id})
-            self.assertThat(rendered_view, soupmatchers.HTMLContains(
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Registry URL", "td",
-                                     text=registry_credentials.url)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag("Username", "td",
-                                     text=registry_credentials.username)),
-                soupmatchers.Within(
-                    row,
-                    soupmatchers.Tag(
-                        "Image name", "td", text=image_name))))
+            row = soupmatchers.Tag(
+                "push rule row", "tr", attrs={"id": "rule-%d" % push_rule.id}
+            )
+            self.assertThat(
+                rendered_view,
+                soupmatchers.HTMLContains(
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Registry URL", "td", text=registry_credentials.url
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag(
+                            "Username",
+                            "td",
+                            text=registry_credentials.username,
+                        ),
+                    ),
+                    soupmatchers.Within(
+                        row,
+                        soupmatchers.Tag("Image name", "td", text=image_name),
+                    ),
+                ),
+            )
 
     def test_edit_oci_push_rules(self):
         url = self.factory.getUniqueURL()
-        credentials = {'username': 'foo', 'password': 'bar'}
+        credentials = {"username": "foo", "password": "bar"}
         registry_credentials = getUtility(IOCIRegistryCredentialsSet).new(
-            registrant=self.person, owner=self.person, url=url,
-            credentials=credentials)
+            registrant=self.person,
+            owner=self.person,
+            url=url,
+            credentials=credentials,
+        )
         image_name = self.factory.getUniqueUnicode()
         push_rule = getUtility(IOCIPushRuleSet).new(
             recipe=self.recipe,
             registry_credentials=registry_credentials,
-            image_name=image_name)
+            image_name=image_name,
+        )
         browser = self.getViewBrowser(self.recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         # assert image name is displayed correctly
         with person_logged_in(self.person):
-            self.assertEqual(image_name, browser.getControl(
-                name="field.image_name.%d" % push_rule.id).value)
+            self.assertEqual(
+                image_name,
+                browser.getControl(
+                    name="field.image_name.%d" % push_rule.id
+                ).value,
+            )
 
         # assert image name is required
         with person_logged_in(self.person):
             browser.getControl(
-                name="field.image_name.%d" % push_rule.id).value = ""
+                name="field.image_name.%d" % push_rule.id
+            ).value = ""
         browser.getControl("Save").click()
         self.assertIn("Required input is missing", browser.contents)
 
         # set image name to valid string
         with person_logged_in(self.person):
             browser.getControl(
-                name="field.image_name.%d" % push_rule.id).value = "image1"
+                name="field.image_name.%d" % push_rule.id
+            ).value = "image1"
         browser.getControl("Save").click()
         # and assert model changed
         with person_logged_in(self.person):
-            self.assertEqual(
-                push_rule.image_name, "image1")
+            self.assertEqual(push_rule.image_name, "image1")
             # Create a second push rule and test we call setNewImageName only
             # in cases where image name is different than the one on the model
             # otherwise we get the exception on rows the user doesn't actually
@@ -1992,16 +2447,17 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
             second_rule = getUtility(IOCIPushRuleSet).new(
                 recipe=self.recipe,
                 registry_credentials=registry_credentials,
-                image_name="second image")
+                image_name="second image",
+            )
         browser = self.getViewBrowser(self.recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         with person_logged_in(self.person):
             browser.getControl(
-                name="field.image_name.%d" % push_rule.id).value = "image2"
+                name="field.image_name.%d" % push_rule.id
+            ).value = "image2"
         browser.getControl("Save").click()
         with person_logged_in(self.person):
-            self.assertEqual(
-                push_rule.image_name, "image2")
+            self.assertEqual(push_rule.image_name, "image2")
 
         # Attempt to set the same name on the second rule
         # will result in expected exception
@@ -2009,48 +2465,67 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         browser.getLink("Edit push rules").click()
         with person_logged_in(self.person):
             browser.getControl(
-                name="field.image_name.%d" % second_rule.id).value = "image2"
-        self.assertRaises(OCIPushRuleAlreadyExists,
-                          browser.getControl("Save").click)
+                name="field.image_name.%d" % second_rule.id
+            ).value = "image2"
+        self.assertRaises(
+            OCIPushRuleAlreadyExists, browser.getControl("Save").click
+        )
 
     def test_edit_oci_push_rules_non_owner_of_credentials(self):
         url = self.factory.getUniqueURL()
-        credentials = {'username': 'foo', 'password': 'bar'}
+        credentials = {"username": "foo", "password": "bar"}
         registry_credentials = getUtility(IOCIRegistryCredentialsSet).new(
-            registrant=self.person, owner=self.person, url=url,
-            credentials=credentials)
+            registrant=self.person,
+            owner=self.person,
+            url=url,
+            credentials=credentials,
+        )
         image_names = [self.factory.getUniqueUnicode() for _ in range(2)]
         push_rules = [
             getUtility(IOCIPushRuleSet).new(
                 recipe=self.team_owned_recipe,
                 registry_credentials=registry_credentials,
-                image_name=image_name)
-            for image_name in image_names]
+                image_name=image_name,
+            )
+            for image_name in image_names
+        ]
         Store.of(push_rules[-1]).flush()
         push_rule_ids = [push_rule.id for push_rule in push_rules]
         browser = self.getViewBrowser(self.team_owned_recipe, user=self.member)
         browser.getLink("Edit push rules").click()
         row = soupmatchers.Tag(
-            "push rule row", "tr", attrs={"class": "push-rule"})
-        self.assertThat(browser.contents, soupmatchers.HTMLContains(
-            soupmatchers.Within(
-                row,
-                soupmatchers.Tag(
-                    "username widget", "span",
-                    attrs={
-                        "id": "field.username.%d" % push_rule_ids[0],
-                        "class": "sprite private",
-                        })),
-            soupmatchers.Within(
-                row,
-                soupmatchers.Tag(
-                    "url widget", "span",
-                    attrs={
-                        "id": "field.url.%d" % push_rule_ids[0],
-                        "class": "sprite private",
-                        }))))
+            "push rule row", "tr", attrs={"class": "push-rule"}
+        )
+        self.assertThat(
+            browser.contents,
+            soupmatchers.HTMLContains(
+                soupmatchers.Within(
+                    row,
+                    soupmatchers.Tag(
+                        "username widget",
+                        "span",
+                        attrs={
+                            "id": "field.username.%d" % push_rule_ids[0],
+                            "class": "sprite private",
+                        },
+                    ),
+                ),
+                soupmatchers.Within(
+                    row,
+                    soupmatchers.Tag(
+                        "url widget",
+                        "span",
+                        attrs={
+                            "id": "field.url.%d" % push_rule_ids[0],
+                            "class": "sprite private",
+                        },
+                    ),
+                ),
+            ),
+        )
         browser.getControl(
-            name="field.image_name.%d" % push_rule_ids[0]).value = "image1"
+            name="field.image_name.%d" % push_rule_ids[0]
+        ).value = "image1"
         browser.getControl("Save").click()
         with person_logged_in(self.member):
             self.assertEqual("image1", push_rules[0].image_name)
@@ -2058,25 +2533,31 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
 
     def test_delete_oci_push_rules(self):
         url = self.factory.getUniqueURL()
-        credentials = {'username': 'foo', 'password': 'bar'}
+        credentials = {"username": "foo", "password": "bar"}
         registry_credentials = getUtility(IOCIRegistryCredentialsSet).new(
-            registrant=self.person, owner=self.person, url=url,
-            credentials=credentials)
+            registrant=self.person,
+            owner=self.person,
+            url=url,
+            credentials=credentials,
+        )
         image_name = self.factory.getUniqueUnicode()
         push_rule = getUtility(IOCIPushRuleSet).new(
             recipe=self.recipe,
             registry_credentials=registry_credentials,
-            image_name=image_name)
+            image_name=image_name,
+        )
         browser = self.getViewBrowser(self.recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         with person_logged_in(self.person):
             browser.getControl(
-                name="field.delete.%d" % push_rule.id).value = True
+                name="field.delete.%d" % push_rule.id
+            ).value = True
         browser.getControl("Save").click()
 
         with person_logged_in(self.person):
             self.assertIsNone(
-                getUtility(IOCIPushRuleSet).getByID(push_rule.id))
+                getUtility(IOCIPushRuleSet).getByID(push_rule.id)
+            )
 
     def test_add_oci_push_rules_validations(self):
         # Add new rule works when there are no rules in the DB.
@@ -2113,20 +2594,28 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         browser.getControl(name="field.add_url").value = url
         browser.getControl("Save").click()
         with person_logged_in(self.person):
-            rules = list(removeSecurityProxy(
-                getUtility(IOCIPushRuleSet).findByRecipe(self.recipe)))
+            rules = list(
+                removeSecurityProxy(
+                    getUtility(IOCIPushRuleSet).findByRecipe(self.recipe)
+                )
+            )
         self.assertEqual(len(rules), 1)
         rule = rules[0]
-        self.assertThat(rule, MatchesStructure(
-            image_name=Equals("imagename1"),
-            registry_url=Equals(url),
-            registry_credentials=MatchesStructure(
-                url=Equals(url),
-                username=Is(None))))
+        self.assertThat(
+            rule,
+            MatchesStructure(
+                image_name=Equals("imagename1"),
+                registry_url=Equals(url),
+                registry_credentials=MatchesStructure(
+                    url=Equals(url), username=Is(None)
+                ),
+            ),
+        )
 
         with person_logged_in(self.person):
             self.assertEqual(
-                {"password": None}, rule.registry_credentials.getCredentials())
+                {"password": None}, rule.registry_credentials.getCredentials()
+            )
 
     def test_add_oci_push_rules_new_username_password(self):
         # Supplying an image name, registry URL, username, and password
@@ -2142,24 +2631,36 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         browser.getControl(name="field.add_username").value = "username"
         browser.getControl(name="field.add_password").value = "password"
         browser.getControl(
-            name="field.add_confirm_password").value = "password"
+            name="field.add_confirm_password"
+        ).value = "password"
         browser.getControl("Save").click()
         with person_logged_in(self.person):
-            rules = list(removeSecurityProxy(
-                getUtility(IOCIPushRuleSet).findByRecipe(self.recipe)))
+            rules = list(
+                removeSecurityProxy(
+                    getUtility(IOCIPushRuleSet).findByRecipe(self.recipe)
+                )
+            )
         self.assertEqual(len(rules), 1)
         rule = rules[0]
-        self.assertThat(rule, MatchesStructure(
-            image_name=Equals("imagename3"),
-            registry_url=Equals(url),
-            registry_credentials=MatchesStructure.byEquality(
-                url=url,
-                username="username")))
+        self.assertThat(
+            rule,
+            MatchesStructure(
+                image_name=Equals("imagename3"),
+                registry_url=Equals(url),
+                registry_credentials=MatchesStructure.byEquality(
+                    url=url, username="username"
+                ),
+            ),
+        )
         with person_logged_in(self.person):
-            self.assertEqual({
-                "username": "username", "password": "password",
-                "region": "somewhere-02"},
-                rule.registry_credentials.getCredentials())
+            self.assertEqual(
+                {
+                    "username": "username",
+                    "password": "password",
+                    "region": "somewhere-02",
+                },
+                rule.registry_credentials.getCredentials(),
+            )
 
     def test_add_oci_push_rules_existing_credentials_duplicate(self):
         # Adding a new push rule using existing credentials fails if a rule
@@ -2167,21 +2668,30 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         existing_rule = self.factory.makeOCIPushRule(
             recipe=self.recipe,
             registry_credentials=self.factory.makeOCIRegistryCredentials(
-                registrant=self.recipe.owner, owner=self.recipe.owner))
+                registrant=self.recipe.owner, owner=self.recipe.owner
+            ),
+        )
         existing_image_name = existing_rule.image_name
         existing_registry_url = existing_rule.registry_url
         existing_username = existing_rule.username
         browser = self.getViewBrowser(self.recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         browser.getControl(name="field.add_credentials").value = "existing"
-        browser.getControl(name="field.add_image_name").value = (
-            existing_image_name)
-        browser.getControl(name="field.existing_credentials").value = (
-            "%s %s" % (quote(existing_registry_url), quote(existing_username)))
+        browser.getControl(
+            name="field.add_image_name"
+        ).value = existing_image_name
+        browser.getControl(
+            name="field.existing_credentials"
+        ).value = "%s %s" % (
+            quote(existing_registry_url),
+            quote(existing_username),
+        )
         browser.getControl("Save").click()
         self.assertIn(
             "A push rule already exists with the same URL, "
-            "image name, and credentials.", browser.contents)
+            "image name, and credentials.",
+            browser.contents,
+        )
 
     def test_add_oci_push_rules_existing_credentials(self):
         # Previously added registry credentials can be chosen from the radio
@@ -2192,27 +2702,38 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         existing_rule = self.factory.makeOCIPushRule(
             recipe=self.recipe,
             registry_credentials=self.factory.makeOCIRegistryCredentials(
-                registrant=self.recipe.owner, owner=self.recipe.owner,
-                credentials={}))
+                registrant=self.recipe.owner,
+                owner=self.recipe.owner,
+                credentials={},
+            ),
+        )
         existing_registry_url = existing_rule.registry_url
         browser = self.getViewBrowser(self.recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         browser.getControl(name="field.add_credentials").value = "existing"
         browser.getControl(name="field.add_image_name").value = "imagename2"
-        browser.getControl(name="field.existing_credentials").value = (
-            quote(existing_registry_url))
+        browser.getControl(name="field.existing_credentials").value = quote(
+            existing_registry_url
+        )
         browser.getControl("Save").click()
         with person_logged_in(self.person):
-            rules = list(removeSecurityProxy(
-                getUtility(IOCIPushRuleSet).findByRecipe(self.recipe)))
+            rules = list(
+                removeSecurityProxy(
+                    getUtility(IOCIPushRuleSet).findByRecipe(self.recipe)
+                )
+            )
         self.assertEqual(len(rules), 2)
         rule = rules[1]
-        self.assertThat(rule, MatchesStructure(
-            image_name=Equals("imagename2"),
-            registry_url=Equals(existing_registry_url),
-            registry_credentials=MatchesStructure(
-                url=Equals(existing_registry_url),
-                username=Is(None))))
+        self.assertThat(
+            rule,
+            MatchesStructure(
+                image_name=Equals("imagename2"),
+                registry_url=Equals(existing_registry_url),
+                registry_credentials=MatchesStructure(
+                    url=Equals(existing_registry_url), username=Is(None)
+                ),
+            ),
+        )
         with person_logged_in(self.person):
             self.assertEqual({}, rule.registry_credentials.getCredentials())
 
@@ -2220,40 +2741,44 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         url = self.factory.getUniqueURL()
         browser = self.getViewBrowser(self.team_owned_recipe, user=self.member)
         browser.getLink("Edit push rules").click()
-        browser.getControl(
-            name="field.add_image_name").value = "imagename1"
-        browser.getControl(
-            name="field.add_url").value = url
+        browser.getControl(name="field.add_image_name").value = "imagename1"
+        browser.getControl(name="field.add_url").value = url
         browser.getControl(name="field.add_credentials").value = "new"
         browser.getControl("Save").click()
 
         with person_logged_in(self.member):
-            rules = list(removeSecurityProxy(
-                getUtility(IOCIPushRuleSet).findByRecipe(
-                    self.team_owned_recipe)))
+            rules = list(
+                removeSecurityProxy(
+                    getUtility(IOCIPushRuleSet).findByRecipe(
+                        self.team_owned_recipe
+                    )
+                )
+            )
         self.assertEqual(len(rules), 1)
         rule = rules[0]
-        self.assertThat(rule, MatchesStructure(
-            image_name=Equals('imagename1'),
-            registry_url=Equals(url),
-            registry_credentials=MatchesStructure(
-                url=Equals(url),
-                username=Is(None))))
+        self.assertThat(
+            rule,
+            MatchesStructure(
+                image_name=Equals("imagename1"),
+                registry_url=Equals(url),
+                registry_credentials=MatchesStructure(
+                    url=Equals(url), username=Is(None)
+                ),
+            ),
+        )
 
         with person_logged_in(self.member):
             self.assertThat(
                 rule.registry_credentials.getCredentials(),
-                MatchesDict(
-                    {"password": Equals(None)}))
+                MatchesDict({"password": Equals(None)}),
+            )
 
     def test_edit_oci_push_rules_team_owned(self):
         url = self.factory.getUniqueURL()
         browser = self.getViewBrowser(self.team_owned_recipe, user=self.member)
         browser.getLink("Edit push rules").click()
-        browser.getControl(
-            name="field.add_image_name").value = "imagename1"
-        browser.getControl(
-            name="field.add_url").value = url
+        browser.getControl(name="field.add_image_name").value = "imagename1"
+        browser.getControl(name="field.add_url").value = url
         browser.getControl(name="field.add_credentials").value = "new"
         browser.getControl("Save").click()
 
@@ -2262,43 +2787,55 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         browser = self.getViewBrowser(self.team_owned_recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         with person_logged_in(self.person):
-            rules = list(removeSecurityProxy(
-                getUtility(IOCIPushRuleSet).findByRecipe(
-                    self.team_owned_recipe)))
+            rules = list(
+                removeSecurityProxy(
+                    getUtility(IOCIPushRuleSet).findByRecipe(
+                        self.team_owned_recipe
+                    )
+                )
+            )
         self.assertEqual(len(rules), 1)
         rule = rules[0]
-        self.assertEqual("imagename1", browser.getControl(
-            name="field.image_name.%d" % rule.id).value)
+        self.assertEqual(
+            "imagename1",
+            browser.getControl(name="field.image_name.%d" % rule.id).value,
+        )
 
         # set image name to valid string
         with person_logged_in(self.person):
             browser.getControl(
-                name="field.image_name.%d" % rule.id).value = "image1"
+                name="field.image_name.%d" % rule.id
+            ).value = "image1"
         browser.getControl("Save").click()
 
         # and assert model changed
         with person_logged_in(self.member):
-            self.assertEqual(
-                rule.image_name, "image1")
+            self.assertEqual(rule.image_name, "image1")
 
         # self.member will see the new image name
         browser = self.getViewBrowser(self.team_owned_recipe, user=self.member)
         browser.getLink("Edit push rules").click()
         with person_logged_in(self.member):
-            self.assertEqual("image1", browser.getControl(
-                name="field.image_name.%d" % rule.id).value)
+            self.assertEqual(
+                "image1",
+                browser.getControl(name="field.image_name.%d" % rule.id).value,
+            )
 
     def test_edit_oci_registry_creds(self):
         url = self.factory.getUniqueURL()
-        credentials = {'username': 'foo', 'password': 'bar'}
+        credentials = {"username": "foo", "password": "bar"}
         image_name = self.factory.getUniqueUnicode()
         registry_credentials = getUtility(IOCIRegistryCredentialsSet).new(
-            registrant=self.person, owner=self.person, url=url,
-            credentials=credentials)
+            registrant=self.person,
+            owner=self.person,
+            url=url,
+            credentials=credentials,
+        )
         getUtility(IOCIPushRuleSet).new(
             recipe=self.recipe,
             registry_credentials=registry_credentials,
-            image_name=image_name)
+            image_name=image_name,
+        )
         browser = self.getViewBrowser(self.recipe, user=self.person)
         browser.getLink("Edit push rules").click()
         browser.getLink("Edit OCI registry credentials").click()
@@ -2307,22 +2844,27 @@ class TestOCIRecipeEditPushRulesView(OCIConfigHelperMixin,
         browser.getControl(name="field.add_region").value = "new_region1"
         browser.getControl(name="field.add_username").value = "new_username"
         browser.getControl(name="field.add_password").value = "password"
-        browser.getControl(name="field.add_confirm_password"
-                           ).value = "password"
+        browser.getControl(
+            name="field.add_confirm_password"
+        ).value = "password"
 
         browser.getControl("Save").click()
         with person_logged_in(self.person):
-            creds = list(getUtility(
-                IOCIRegistryCredentialsSet).findByOwner(
-                self.person))
+            creds = list(
+                getUtility(IOCIRegistryCredentialsSet).findByOwner(self.person)
+            )
 
             self.assertEqual(url, creds[1].url)
             self.assertThat(
                 (creds[1]).getCredentials(),
-                MatchesDict({
-                    "username": Equals("new_username"),
-                    "password": Equals("password"),
-                    "region": Equals("new_region1")}))
+                MatchesDict(
+                    {
+                        "username": Equals("new_username"),
+                        "password": Equals("password"),
+                        "region": Equals("new_region1"),
+                    }
+                ),
+            )
 
 
 class TestOCIRecipeListingView(BaseTestOCIRecipeView):
@@ -2330,32 +2872,42 @@ class TestOCIRecipeListingView(BaseTestOCIRecipeView):
         super().setUp()
         self.ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
         self.distroseries = self.factory.makeDistroSeries(
-            distribution=self.ubuntu, name="shiny", displayname="Shiny")
+            distribution=self.ubuntu, name="shiny", displayname="Shiny"
+        )
         self.architectures = []
         for processor, architecture in ("386", "i386"), ("amd64", "amd64"):
             das = self.factory.makeDistroArchSeries(
-                distroseries=self.distroseries, architecturetag=architecture,
-                processor=getUtility(IProcessorSet).getByName(processor))
+                distroseries=self.distroseries,
+                architecturetag=architecture,
+                processor=getUtility(IProcessorSet).getByName(processor),
+            )
             das.addOrUpdateChroot(self.factory.makeLibraryFileAlias())
             self.architectures.append(das)
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: "on"}))
         self.oci_project = self.factory.makeOCIProject(
             pillar=self.distroseries.distribution,
-            ociprojectname="oci-project-name")
+            ociprojectname="oci-project-name",
+        )
 
     def makeRecipes(self, count=1, **kwargs):
         with person_logged_in(self.person):
             owner = self.factory.makePerson()
-            return [self.factory.makeOCIRecipe(
-                registrant=owner, owner=owner, oci_project=self.oci_project,
-                **kwargs)
-                for _ in range(count)]
+            return [
+                self.factory.makeOCIRecipe(
+                    registrant=owner,
+                    owner=owner,
+                    oci_project=self.oci_project,
+                    **kwargs,
+                )
+                for _ in range(count)
+            ]
 
     def test_oci_recipe_list_for_person(self):
         owner = self.factory.makePerson(name="recipe-owner")
         for i in range(2):
             self.factory.makeOCIRecipe(
-                name="my-oci-recipe-%s" % i, owner=owner, registrant=owner)