Merge branch 'main' into dependabot/pip/packages/jsii/python-runtime/…

…black-approx-eq-24.10

.mergify/config.yml

@@ -1,9 +1,24 @@
 # See https://doc.mergify.io
 queue_rules:
-  - name: default
+  - name: default-squash
     conditions:
       - status-success~=^jsii/superchain
       - status-success=Unit Tests
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: squash
+
+  - name: default-merge
+    conditions:
+      - status-success~=^jsii/superchain
+      - status-success=Unit Tests
+    commit_message_template: |-
+      {{ title }} (#{{ number }})
+
+      {{ body }}
+    merge_method: merge
 
 pull_request_rules:
   - name: label core
@@ -42,12 +57,7 @@ pull_request_rules:
         approved: true
         changes_requested: false
       queue:
-        name: default
-        method: squash
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
+        name: default-squash
       comment:
         message: Merging (with squash)...
     conditions:
@@ -73,12 +83,7 @@ pull_request_rules:
         approved: true
         changes_requested: false
       queue:
-        name: default
-        method: merge
-        commit_message_template: |-
-          {{ title }} (#{{ number }})
-
-          {{ body }}
+        name: default-merge
       comment:
         message: Merging (no-squash)...
     conditions:

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
 mkdocs~=1.6.1
 mkdocs-awesome-pages-plugin~=2.9.3
-mkdocs-material~=9.5.39
+mkdocs-material~=9.5.40
 mkdocs-git-revision-date-plugin~=0.3.2

packages/jsii-pacmak/test/generated-code/requirements-dev.txt

@@ -1,2 +1,2 @@
-mypy==1.11.2
+mypy==1.12.0
 pip==24.2 # required to use --config-settings