misc: Merge release-staging-v23-1 into stable (#711)

.git-blame-ignore-revs

@@ -29,3 +29,9 @@ c3bd8eb1214cbebbc92c7958b80aa06913bce3ba
 
 # A commit which ran flynt all Python files.
 e73655d038cdfa68964109044e33c9a6e7d85ac9
+
+# A commit which ran pre-commit on ext/testlib
+9e1afdecefaf910fa6e266f29dc480a32b0fa83e
+
+# Updated black from 22.6.0 to 23.9.1
+ddf6cb88e48df4ac7de4a9e4b612daf2e7e635c8

.gitignore

@@ -1,4 +1,5 @@
 build
+gem5_build
 parser.out
 parsetab.py
 cscope.files
@@ -32,3 +33,4 @@ configs/example/memcheck.cfg
 configs/dram/lowp_sweep.cfg
 .pyenv
 .vscode
+typings

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+---
 # Copyright (c) 2022 Arm Limited
 # All rights reserved.
 #
@@ -33,57 +34,77 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-minimum_pre_commit_version: "2.18"
+minimum_pre_commit_version: '2.18'
 
 default_language_version:
-  python: python3
+    python: python3
 
 exclude: |
-  (?x)^(
-    ext/.*|
-    build/.*|
-    src/systemc/ext/.*|
-    src/systemc/tests/.*/.*|
-    src/python/m5/ext/pyfdt/.*|
-    tests/.*/ref/.*
-  )$
+    (?x)^(
+      ext/(?!testlib/).*|
+      build/.*|
+      src/systemc/ext/.*|
+      src/systemc/tests/.*/.*|
+      src/python/m5/ext/pyfdt/.*|
+      tests/.*/ref/.*
+    )$
 
 default_stages: [commit]
 
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
-  hooks:
-  - id: trailing-whitespace
-  - id: end-of-file-fixer
-  - id: check-json
-  - id: check-yaml
-  - id: check-added-large-files
-  - id: mixed-line-ending
-    args: [--fix=lf]
-  - id: check-case-conflict
-- repo: https://github.com/psf/black
-  rev: 22.6.0
-  hooks:
-    - id: black
-- repo: local
-  hooks:
-  - id: gem5-style-checker
-    name: gem5 style checker
-    entry: util/git-pre-commit.py
-    always_run: true
-    exclude: ".*"
-    language: system
-    description: 'The gem5 style checker hook.'
-  - id: gem5-commit-msg-checker
-    name: gem5 commit msg checker
-    entry: ext/git-commit-msg
-    language: system
-    stages: [commit-msg]
-    description: 'The gem5 commit message checker hook.'
-  - id: gerrit-commit-msg-job
-    name: gerrit commit message job
-    entry: util/gerrit-commit-msg-hook
-    language: system
-    stages: [commit-msg]
-    description: 'Adds Change-ID to the commit message. Needed by Gerrit.'
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v4.5.0
+      hooks:
+          - id: trailing-whitespace
+          - id: end-of-file-fixer
+          - id: check-json
+          - id: check-yaml
+          - id: check-added-large-files
+          - id: mixed-line-ending
+            args: [--fix=lf]
+          - id: check-ast
+          - id: check-case-conflict
+          - id: check-merge-conflict
+          - id: check-symlinks
+          - id: destroyed-symlinks
+          - id: requirements-txt-fixer
+    - repo: https://github.com/PyCQA/isort
+      rev: 5.11.5
+      hooks:
+          - id: isort
+    - repo: https://github.com/jumanjihouse/pre-commit-hook-yamlfmt
+      rev: 0.2.3
+      hooks:
+          - id: yamlfmt
+    - repo: https://github.com/psf/black
+      rev: 23.9.1
+      hooks:
+          - id: black
+    - repo: https://github.com/asottile/pyupgrade
+      rev: v3.14.0
+      hooks:
+          - id: pyupgrade
+            # Python 3.8 is the earliest version supported.
+            # We therefore conform to the standards compatible with 3.8+.
+            args: [--py38-plus]
+    - repo: local
+      hooks:
+          - id: gem5-style-checker
+            name: gem5 style checker
+            entry: util/git-pre-commit.py
+            always_run: true
+            exclude: .*
+            language: system
+            description: The gem5 style checker hook.
+          - id: gem5-commit-msg-checker
+            name: gem5 commit msg checker
+            entry: ext/git-commit-msg
+            language: system
+            stages: [commit-msg]
+            description: The gem5 commit message checker hook.
+          - id: gerrit-commit-msg-job
+            name: gerrit commit message job
+            entry: util/gerrit-commit-msg-hook
+            language: system
+            stages: [commit-msg]
+            description: Adds Change-ID to the commit message. Needed by Gerrit.