From 16308e71f6c546093af6a2a2fecbe31adaa2bb94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 13:32:01 +0000 Subject: [PATCH 1/3] chore(deps-dev): Update mkdocs-material requirement from ~=9.5.39 to ~=9.5.40 in /gh-pages (#4666) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the requirements on [mkdocs-material](https://github.com/squidfunk/mkdocs-material) to permit the latest version.
Release notes

Sourced from mkdocs-material's releases.

mkdocs-material-9.5.40

Thanks go to @​pekkaklarck and @​klejejs for their contributions

Changelog

Sourced from mkdocs-material's changelog.

mkdocs-material-9.5.40 (2024-10-10)

mkdocs-material-9.5.39+insiders-4.53.14 (2024-09-29)

mkdocs-material-9.5.39 (2024-09-29)

mkdocs-material-9.5.38 (2024-09-26)

mkdocs-material-9.5.37 (2024-09-25)

mkdocs-material-9.5.36 (2024-09-21)

mkdocs-material-9.5.35 (2024-09-18)

mkdocs-material-9.5.34+insiders-4.53.13 (2024-09-14)

mkdocs-material-9.5.34 (2024-08-31)

mkdocs-material-9.5.33 (2024-08-23)

mkdocs-material-9.5.32 (2024-08-19)

mkdocs-material-9.5.31+insiders-4.53.12 (2024-08-02)

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- gh-pages/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index 13237106c8..d0ad1eb977 100644 --- a/gh-pages/requirements-dev.txt +++ b/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 From 76b99a9e86ad0cce5683308723c0b83de922fb47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:40:06 +0000 Subject: [PATCH 2/3] chore(deps-dev): Bump mypy from 1.11.2 to 1.12.0 in /packages/jsii-pacmak/test/generated-code (#4668) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [mypy](https://github.com/python/mypy) from 1.11.2 to 1.12.0.
Changelog

Sourced from mypy's changelog.

Mypy Release Notes

Next release

Mypy 1.12

We’ve just uploaded mypy 1.12 to the Python Package Index (PyPI). Mypy is a static type checker for Python. This release includes new features, performance improvements and bug fixes. You can install it as follows:

python3 -m pip install -U mypy

You can read the full documentation for this release on Read the Docs.

Support Python 3.12 Syntax for Generics (PEP 695)

Support for the new type parameter syntax introduced in Python 3.12 is now enabled by default, documented, and no longer experimental. It was available through a feature flag in mypy 1.11 as an experimental feature.

This example demonstrates the new syntax:

# Generic function
def f[T](https://github.com/python/mypy/blob/master/x: T) -> T: ...

reveal_type(f(1)) # Revealed type is 'int'

Generic class

class C[T]: def init(self, x: T) -> None: self.x = x

c = C('a') reveal_type(c.x) # Revealed type is 'str'

Type alias

type A[T] = C[list[T]]

For more information, refer to the documentation.

These improvements are included:

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.11.2&new-version=1.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/jsii-pacmak/test/generated-code/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsii-pacmak/test/generated-code/requirements-dev.txt b/packages/jsii-pacmak/test/generated-code/requirements-dev.txt index 23e2883694..90c940664d 100644 --- a/packages/jsii-pacmak/test/generated-code/requirements-dev.txt +++ b/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 From 1a02f121ec9c7f6093f6aa04feb899c2441cfe11 Mon Sep 17 00:00:00 2001 From: Otavio Macedo <288203+otaviomacedo@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:34:57 +0100 Subject: [PATCH 3/3] chore(mergify): move deprecated parameters from `pull_request_rules` to `queue_rules` (#4670) We are using deprecated parameters that are about to be removed (October 21st, 2024). Ideally we should move away from Mergify and use GitHub merge queues. But the config for this repository is more complex, with many pull request rules. Let's avoid breaking the PRs for now and then we can come back and migrate to merge queues. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- .mergify/config.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.mergify/config.yml b/.mergify/config.yml index 5398c6f322..163a8412af 100644 --- a/.mergify/config.yml +++ b/.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: