← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:pre-commit-autoupdate into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:pre-commit-autoupdate into launchpad:master.

Commit message:
Update pre-commit hooks

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/455256

This involved a number of spelling corrections and a couple of changes by `pyupgrade`.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:pre-commit-autoupdate into launchpad:master.
diff --git a/.codespell-ignore b/.codespell-ignore
index 7af0ae1..b855d06 100644
--- a/.codespell-ignore
+++ b/.codespell-ignore
@@ -1,6 +1,7 @@
 buildd
 changee
 coo
+debbugs
 distroname
 falsy
 fpr
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7e7f119..55d7cf5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
     -   id: check-added-large-files
     -   id: check-ast
@@ -26,7 +26,7 @@ repos:
     -   id: no-commit-to-branch
         args: [--branch, master, --branch, db-devel]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.15.0
     hooks:
     -   id: pyupgrade
         args: [--keep-percent-format]
@@ -36,7 +36,7 @@ repos:
             |utilities/community-contributions\.py
           )$
 -   repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.9.1
+    rev: 23.10.1
     hooks:
       - id: black
         exclude: |
@@ -62,7 +62,7 @@ repos:
           - flake8-alfred==1.1.1
           - flake8-bugbear==23.3.12
 -   repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.33.0
+    rev: v8.53.0
     hooks:
     -   id: eslint
         args: [--quiet]
@@ -70,7 +70,7 @@ repos:
         # use the proxy correctly in Launchpad CI builds.
         language_version: "20.6.1"
 -   repo: https://github.com/keewis/blackdoc
-    rev: v0.3.8
+    rev: v0.3.9
     hooks:
     -   id: blackdoc
         args: ["-l", "78"]
@@ -82,11 +82,11 @@ repos:
         args: [--allow-option-flag, IGNORE_EXCEPTION_MODULE_IN_PYTHON2]
         exclude: ^doc/.*
 -   repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.2
+    rev: v0.9.0.6
     hooks:
     -   id: shellcheck
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.2.6
     hooks:
     -   id: codespell
         args: ["-I", ".codespell-ignore"]
diff --git a/lib/lp/answers/stories/question-add.rst b/lib/lp/answers/stories/question-add.rst
index 9be06dc..3723f10 100644
--- a/lib/lp/answers/stories/question-add.rst
+++ b/lib/lp/answers/stories/question-add.rst
@@ -2,7 +2,7 @@ Asking New Questions
 ====================
 
 There are two paths available to a user to ask a new question. The first
-one involes two steps. First, go to the product or distribution for
+one involves two steps. First, go to the product or distribution for
 which support is desired:
 
     >>> browser.open("http://answers.launchpad.test/ubuntu";)
diff --git a/lib/lp/app/javascript/calendar.js b/lib/lp/app/javascript/calendar.js
index 5271734..d169199 100644
--- a/lib/lp/app/javascript/calendar.js
+++ b/lib/lp/app/javascript/calendar.js
@@ -64,7 +64,7 @@ var get_initial_value_for_input = function(date_input_node) {
  * to the provided time.
  *
  * @method create_time_selector_node
- * @param selected_time {Date} an optional Date instance for inititial
+ * @param selected_time {Date} an optional Date instance for initial
  *     time values. If not provided the current time will be used instead.
  */
 var create_time_selector_node = function(selected_time) {
diff --git a/lib/lp/archiveuploader/tests/nascentupload.rst b/lib/lp/archiveuploader/tests/nascentupload.rst
index 29cbca8..989a31f 100644
--- a/lib/lp/archiveuploader/tests/nascentupload.rst
+++ b/lib/lp/archiveuploader/tests/nascentupload.rst
@@ -362,7 +362,7 @@ Retrieve the just-inserted SourcePackageRelease correspondent to 'ed'
 
     >>> ed_spr = ed_src.queue_root.sources[0].sourcepackagerelease
 
-Check if we have rebuid the change's author line properly (as
+Check if we have rebuilt the change's author line properly (as
 mentioned in bug # 30621)
 
     >>> print(ed_spr.changelog_entry)  # doctest: -NORMALIZE_WHITESPACE
diff --git a/lib/lp/archiveuploader/tests/nascentuploadfile.rst b/lib/lp/archiveuploader/tests/nascentuploadfile.rst
index 78bfed5..73febfc 100644
--- a/lib/lp/archiveuploader/tests/nascentuploadfile.rst
+++ b/lib/lp/archiveuploader/tests/nascentuploadfile.rst
@@ -121,7 +121,7 @@ At this point the changesfile content is already parsed:
     >>> print(ed_binary_changes.suite_name)
     unstable
 
-Push upload targeted suite into policy before the checks, nomally done
+Push upload targeted suite into policy before the checks, normally done
 by NascentUpload object:
 
     >>> modified_insecure_policy.setDistroSeriesAndPocket(
diff --git a/lib/lp/blueprints/stories/standalone/subscribing.rst b/lib/lp/blueprints/stories/standalone/subscribing.rst
index e3ba464..f6707bb 100644
--- a/lib/lp/blueprints/stories/standalone/subscribing.rst
+++ b/lib/lp/blueprints/stories/standalone/subscribing.rst
@@ -324,7 +324,7 @@ to the team's preferred email address.
 Viewing the subscribers
 -----------------------
 
-The subcribers portlet lists each subscriber with the appropriate icon
+The subscribers portlet lists each subscriber with the appropriate icon
 representing whether the person is essential to the specification or
 not.
 
diff --git a/lib/lp/bugs/doc/bug-change.rst b/lib/lp/bugs/doc/bug-change.rst
index 19309cf..466306b 100644
--- a/lib/lp/bugs/doc/bug-change.rst
+++ b/lib/lp/bugs/doc/bug-change.rst
@@ -392,7 +392,7 @@ space-separated string for display.
      'oldvalue': 'first-tag second-tag third-tag',
      'whatchanged': 'tags'}
 
-Addtions and removals are expressed separately in the notification.
+Additions and removals are expressed separately in the notification.
 
     >>> print(tags_change.getBugNotification()["text"])
     ** Tags removed: first-tag
diff --git a/lib/lp/bugs/doc/bugnotification-sending.rst b/lib/lp/bugs/doc/bugnotification-sending.rst
index d254cc3..96f709f 100644
--- a/lib/lp/bugs/doc/bugnotification-sending.rst
+++ b/lib/lp/bugs/doc/bugnotification-sending.rst
@@ -1321,7 +1321,7 @@ Notification Recipients
 -----------------------
 
 Bug notifications are sent to direct subscribers of a bug as well as to
-structural subscribers. Structural subcribers can select the
+structural subscribers. Structural subscribers can select the
 notification level of the subscription.
 
     >>> flush_notifications()
diff --git a/lib/lp/bugs/doc/bugtask-bugwatch-widget.rst b/lib/lp/bugs/doc/bugtask-bugwatch-widget.rst
index a778f7e..7417dad 100644
--- a/lib/lp/bugs/doc/bugtask-bugwatch-widget.rst
+++ b/lib/lp/bugs/doc/bugtask-bugwatch-widget.rst
@@ -69,7 +69,7 @@ will be selected.
     >>> for item in bugwatch_widget.renderItems(mozilla_bugwatch):
     ...     print_item(item)
     ...
-    NOT SELECTED: <label...> None, the status of the bug is updated manuall...
+    NOT SELECTED: <label...> None, the status of the bug is updated ...
     SELECTED: <label...> The Mozilla.org Bug Tracker <a...>#123543</a>...
     NOT SELECTED: <label...> The Mozilla.org Bug Tracker <a...>#2000</a>...
     NOT SELECTED: <label...> The Mozilla.org Bug Tracker <a...>#42</a>...
@@ -85,7 +85,7 @@ button will be selected.
     >>> for item in bugwatch_widget.renderItems(new_bugwatch_value):
     ...     print_item(item)
     ...
-    NOT SELECTED: <label...> None, the status of the bug is updated manuall...
+    NOT SELECTED: <label...> None, the status of the bug is updated ...
     NOT SELECTED: <label...> The Mozilla.org Bug Tracker <a...>#123543</a>...
     NOT SELECTED: <label...> The Mozilla.org Bug Tracker <a...>#2000</a>...
     NOT SELECTED: <label...> The Mozilla.org Bug Tracker <a...>#42</a>...
diff --git a/lib/lp/bugs/stories/bug-release-management/xx-bug-release-management.rst b/lib/lp/bugs/stories/bug-release-management/xx-bug-release-management.rst
index 870e0a8..28794d0 100644
--- a/lib/lp/bugs/stories/bug-release-management/xx-bug-release-management.rst
+++ b/lib/lp/bugs/stories/bug-release-management/xx-bug-release-management.rst
@@ -70,7 +70,7 @@ Nominate a bug to a distribution release
 A bug can be nominated for a distribution release.
 
     >>> login("foo.bar@xxxxxxxxxxxxx")
-    >>> nominater = factory.makePerson(name="denominater")
+    >>> nominater = factory.makePerson()
     >>> poseidon = factory.makeDistribution(
     ...     name="poseidon", bug_supervisor=nominater
     ... )
diff --git a/lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.rst b/lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.rst
index aac16ca..d4ed945 100644
--- a/lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.rst
+++ b/lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.rst
@@ -26,7 +26,7 @@ In this case all bugs are returned.
      Mozilla Firefox Low New
 
 When we uncheck 'Show bugs without linked branches', only bugs with
-linkes branches are returned.
+linked branches are returned.
 
     >>> anon_browser.open(
     ...     "http://bugs.launchpad.test/firefox/+bugs?advanced=1";
diff --git a/lib/lp/code/doc/branch.rst b/lib/lp/code/doc/branch.rst
index 1b92425..1bd6e2b 100644
--- a/lib/lp/code/doc/branch.rst
+++ b/lib/lp/code/doc/branch.rst
@@ -288,7 +288,7 @@ generated diffs between revisions that are emailed out.  The
 review_level controls the amount of notification caused by code review
 activities.
 
-Both of these attributes are contolled through the UI through the use of
+Both of these attributes are controlled through the UI through the use of
 the enumerated types: BranchSubscriptionDiffSize, and
 BranchSubscriptionNotificationLevel.
 
diff --git a/lib/lp/code/javascript/branchmergeproposal.inlinecomments.js b/lib/lp/code/javascript/branchmergeproposal.inlinecomments.js
index 2eb96af..f37fcf3 100644
--- a/lib/lp/code/javascript/branchmergeproposal.inlinecomments.js
+++ b/lib/lp/code/javascript/branchmergeproposal.inlinecomments.js
@@ -771,7 +771,7 @@ namespace.get_headers = function() {
 namespace.set_comments = function(headers) {
     var i;
     delete namespace.comment_idx;
-    // Set first and last comment indices, allowing for nav fallthough.
+    // Set first and last comment indices, allowing for nav fallthrough.
     for (i = 0; i < headers.length; i++) {
         if (!namespace.comment_idx
             && namespace.header_has_type(headers[i], 'comment')) {
diff --git a/lib/lp/code/stories/branches/xx-subscribing-branches.rst b/lib/lp/code/stories/branches/xx-subscribing-branches.rst
index f84cfc2..8930cc3 100644
--- a/lib/lp/code/stories/branches/xx-subscribing-branches.rst
+++ b/lib/lp/code/stories/branches/xx-subscribing-branches.rst
@@ -223,7 +223,7 @@ The user does not have to be in the team to subscribe them.
     Landscape Developers
     Mark Shuttleworth
 
-Launchpad administrators can edit anyones branch subsription.
+Launchpad administrators can edit anyone's branch subscription.
 
     >>> admin_browser.open(
     ...     "http://code.launchpad.test/~name12/gnome-terminal/main";
diff --git a/lib/lp/registry/javascript/structural-subscription.js b/lib/lp/registry/javascript/structural-subscription.js
index dcbfc3f..ad6a1fd 100644
--- a/lib/lp/registry/javascript/structural-subscription.js
+++ b/lib/lp/registry/javascript/structural-subscription.js
@@ -1664,7 +1664,7 @@ function validate_config(config) {
 namespace._validate_config = validate_config;
 
 /**
- * Do pre-setup checks and initalizations.
+ * Do pre-setup checks and initializations.
  * Sets up the LP client and ensures the user is logged-in.
  */
 function pre_setup(config) {
diff --git a/lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.rst b/lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.rst
index 4471a04..f82a22c 100644
--- a/lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.rst
+++ b/lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.rst
@@ -100,7 +100,7 @@ Just like Launchpad administrators can.
     >>> print(admin_browser.url)
     http://launchpad.test/ubuntu
 
-Only administators can configure the publisher for the distribution:
+Only administrators can configure the publisher for the distribution:
 
     >>> admin_browser.getLink("Configure publisher").click()
     >>> print(admin_browser.title)
diff --git a/lib/lp/scripts/utilities/settingsauditor.py b/lib/lp/scripts/utilities/settingsauditor.py
index efc63ef..ff6546d 100644
--- a/lib/lp/scripts/utilities/settingsauditor.py
+++ b/lib/lp/scripts/utilities/settingsauditor.py
@@ -71,7 +71,7 @@ class SettingsAuditor:
             self.config_blocks[block] = data
 
     def _checkForDupes(self, data, label):
-        settings = defaultdict(lambda: 0)
+        settings = defaultdict(int)
         for line in data:
             settings[self._getSetting(line)] += 1
         dupe_settings = [
diff --git a/lib/lp/services/job/scripts/process_job_source.py b/lib/lp/services/job/scripts/process_job_source.py
index 0f78e57..71584c9 100644
--- a/lib/lp/services/job/scripts/process_job_source.py
+++ b/lib/lp/services/job/scripts/process_job_source.py
@@ -85,7 +85,7 @@ class ProcessSingleJobSource(LaunchpadCronScript):
 
     def job_counts(self, jobs):
         """Return a list of tuples containing the job name and counts."""
-        counts = defaultdict(lambda: 0)
+        counts = defaultdict(int)
         for job in jobs:
             counts[job.__class__.__name__] += 1
         return sorted(counts.items())
diff --git a/lib/lp/soyuz/doc/package-cache.rst b/lib/lp/soyuz/doc/package-cache.rst
index d74ac9a..701bf20 100644
--- a/lib/lp/soyuz/doc/package-cache.rst
+++ b/lib/lp/soyuz/doc/package-cache.rst
@@ -816,7 +816,7 @@ Disabled archives caches
 Once recognized as disabled, archives have their caches purged, so they
 won't be listed in package searches anymore.
 
-First, we rebuild and examinate the caches for Celso's PPA.
+First, we rebuild and examine the caches for Celso's PPA.
 
     # Helper functions for completing rebuilding and dumping cache
     # contents for a given Archive.
diff --git a/lib/lp/soyuz/doc/packagecopyrequest.rst b/lib/lp/soyuz/doc/packagecopyrequest.rst
index b44a409..1e3f7b8 100644
--- a/lib/lp/soyuz/doc/packagecopyrequest.rst
+++ b/lib/lp/soyuz/doc/packagecopyrequest.rst
@@ -50,7 +50,7 @@ As well as Mark's identity and the 'ubuntu' distribution..
     ... )
 
 .. and a package location targeting ubuntu/warty and a different copy
-archive (for snaphots).
+archive (for snapshots).
 
     >>> snapshot_target = build_package_location("ubuntu", "warty")
     >>> snapshot_target.archive = snapshot_archive
diff --git a/lib/lp/translations/javascript/importqueueentry.js b/lib/lp/translations/javascript/importqueueentry.js
index 7281bb2..4740028 100644
--- a/lib/lp/translations/javascript/importqueueentry.js
+++ b/lib/lp/translations/javascript/importqueueentry.js
@@ -137,7 +137,7 @@ function alterFields(file_type, alteration) {
  * Change selected file type.
  * @private
  * @param file_type The newly selected file type.
- * @param interactively Animate the appareance of previously hidden fields.
+ * @param interactively Animate the appearance of previously hidden fields.
  */
 function updateCurrentFileType(file_type, interactively) {
     // Hide irrelevant fields.