From 5efc234bd0619fcd9c19c1fea7f6e8d89e0b97f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 11:43:27 +0000 Subject: [PATCH 1/5] chore(deps): Bump Newtonsoft.Json from 13.0.2 to 13.0.3 in /packages/@jsii/dotnet-runtime-test/test (#4001) Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.2 to 13.0.3.
Release notes

Sourced from Newtonsoft.Json's releases.

13.0.3

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Newtonsoft.Json&package-manager=nuget&previous-version=13.0.2&new-version=13.0.3)](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 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/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index 0dcddbcc2d..da0bf3d1d0 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -16,6 +16,6 @@ - + From ed9769d37a5c79cfbf4df9219c90d591b20f9eb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 12:54:32 +0000 Subject: [PATCH 2/5] chore(deps): Bump mypy from 1.0.1 to 1.1.1 in /packages/@jsii/python-runtime (#4002) Bumps [mypy](https://github.com/python/mypy) from 1.0.1 to 1.1.1.
Commits
  • 9b777a3 bump version to 1.1.1 for wheels build
  • 6d355f5 [Release 1.1] Cherry-pick some mypyc build fixes (#14820)
  • a27dec5 Fix --strict-equality crash for instances of a class generic over a `ParamS...
  • c201658 Remove +dev from version number before release
  • 17fba49 [1.1 backport] [dataclass_transform] include dataclass_fields in transfor...
  • f2cac4a [1.1 backport] [dataclass_transform] detect transform spec changes in increme...
  • c03e979 Stubtest: Link directly to line (#14437)
  • 8a487ff Sync typeshed (#14733)
  • c99133f Fix for bug with in operation on optionals in no-strict-optional mode (#1...
  • ef3187a Update commit hashes in sync typeshed script (#14720)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.0.1&new-version=1.1.1)](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 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/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index c40579c55d..b540feedd2 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -1,5 +1,5 @@ black~=23.1 -mypy==1.0.1 +mypy==1.1.1 pip~=23.0 pytest~=7.2 pytest-mypy~=0.10 From fbe0cbe69ecdd1dd961afa4f73519880bfd34db4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 14:04:15 +0000 Subject: [PATCH 3/5] chore(deps-dev): Update mkdocs-material requirement from ~=9.1.1 to ~=9.1.2 in /gh-pages (#4003) 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.1.2

  • Updated Icelandic, Korean and Swedish translations
  • Fixed #5168: Mermaid text boxes overflow (9.0.13 regression)
  • Fixed #5155: table of contents not highlighting percent-encoded URLs
Changelog

Sourced from mkdocs-material's changelog.

mkdocs-material-9.1.2+insiders-4.32.3 (2023-03-09)

  • Fixed Docker image release workflow (9.1.0 regression)
  • Fixed #5159: Missing underline for abbreviations (9.1.0 regression)

mkdocs-material-9.1.2 (2023-03-09)

  • Updated Icelandic, Korean and Swedish translations
  • Fixed #5168: Mermaid text boxes overflow (9.0.13 regression)
  • Fixed #5155: table of contents not highlighting percent-encoded URLs

mkdocs-material-9.1.1 (2023-03-05)

  • Updated Czech and Thai translations
  • Improved instant loading (scroll restoration, slow connections)
  • Fixed #5023: Instant loading not allowing to go back to initial page
  • Fixed #3797: Instant loading does not work with section anchors in Safari

mkdocs-material-9.1.0+insiders-4.32.2 (2023-03-02)

  • Fixed #5127: Privacy plugin not handling large number of occurrences
  • Fixed #5126: Privacy plugin breaks when replacing specific emojis

mkdocs-material-9.1.0 (2023-03-02)

  • Docker image now available for amd64, arm64 and arm/v7
  • Updated Chinese (Taiwanese) translations
  • Generalized tag identifier implementation
  • Fixed flickering of header shadow on load
  • Fixed occasional flickering of announcement bar

mkdocs-material-9.0.15 (2023-02-26)

  • Updated Chinese (Traditional) translations
  • Updated Hebrew translations

mkdocs-material-9.0.14+insiders-4.32.1 (2023-02-23)

  • Fixed code block spans interfering with copying
  • Fixed #5077: Privacy plugin breaks image alt text encoding
  • Fixed #5079: Privacy plugin removing rel=me on external links

mkdocs-material-9.0.14 (2023-02-23)

  • Fixed #5072: Rendering bug on navigation expand button in Firefox

mkdocs-material-9.0.13+insiders-4.32.0 (2023-02-19)

  • Added support for custom selectors for code annotations
  • Added support for code line range selection for better sharing

... (truncated)

Commits
  • c57b5b2 Prepare 9.1.2 release
  • cde2bce Documentation
  • 5b7cf17 Fixed Mermaid text boxes incorrectly computed (9.0.13 regression)
  • 6538b35 Updated Korean translations
  • e11b708 Updated Swedish translations
  • 64ca8fe Fixed table of contents following not working for percent-encoded URIs
  • 19fb69e Merge pull request #5149 from squidfunk/dependabot/npm_and_yarn/types/sass-1....
  • 844bbe3 Bump @​types/sass from 1.43.1 to 1.45.0
  • 6fcf44b Updated dependencies
  • 294b729 Updated Icelandic translations
  • Additional commits viewable in compare view

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 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 6e6f283cc2..6d71d76492 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ mkdocs~=1.4.2 mkdocs-awesome-pages-plugin~=2.8.0 -mkdocs-material~=9.1.1 +mkdocs-material~=9.1.2 mkdocs-git-revision-date-plugin~=0.3.2 From 37c29f7c944b9abe9d7f26c313d729f7af6970a8 Mon Sep 17 00:00:00 2001 From: Romain Marcadier Date: Thu, 16 Mar 2023 16:37:21 +0100 Subject: [PATCH 4/5] fix(pacmak): runtime dependency should match pacmak release (#4013) The code generated by `jsii-pacmak` has a dependency on jsii runtime versions that are expected to match that of `jsii-pacmak` itself. This fixes the .NET and Python generators using the assembly's `jsiiVersion` property, which is a metadata field supposed to only indicate what version of the compiler was used to build the assembly. --- 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 --- packages/jsii-pacmak/generate.sh | 4 ++-- .../lib/targets/dotnet/filegenerator.ts | 6 ++---- packages/jsii-pacmak/lib/targets/python.ts | 9 ++------- .../prerelease-identifiers.test.js.snap | 16 ++++++++-------- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/packages/jsii-pacmak/generate.sh b/packages/jsii-pacmak/generate.sh index 35af21b858..1584183c43 100644 --- a/packages/jsii-pacmak/generate.sh +++ b/packages/jsii-pacmak/generate.sh @@ -14,10 +14,10 @@ VERSION=$(node -p "require('./package.json').version.replace(/\\+[0-9a-f]+\$/, ' cat > lib/version.ts < { if (value.partOfCompilation) { diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts index 0a7a010423..e5915a99a1 100644 --- a/packages/jsii-pacmak/lib/targets/python.ts +++ b/packages/jsii-pacmak/lib/targets/python.ts @@ -18,6 +18,7 @@ import { warn } from '../logging'; import { md2rst } from '../markdown'; import { Target, TargetOptions } from '../target'; import { shell } from '../util'; +import { VERSION } from '../version'; import { renderSummary, PropertyDefinition } from './_utils'; import { NamingContext, @@ -2080,12 +2081,6 @@ class Package { ); code.closeFile('README.md'); - // Strip " (build abcdef)" from the jsii version - const jsiiVersionSimple = toReleaseVersion( - this.metadata.jsiiVersion.replace(/ .*$/, ''), - TargetName.PYTHON, - ); - const setupKwargs = { name: this.name, version: this.version, @@ -2109,7 +2104,7 @@ class Package { package_data: packageData, python_requires: '~=3.7', install_requires: [ - `jsii${toPythonVersionRange(`^${jsiiVersionSimple}`)}`, + `jsii${toPythonVersionRange(`^${VERSION}`)}`, 'publication>=0.0.3', 'typeguard~=2.13.3', ] diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap index fb35301af4..7323da788f 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap @@ -84,7 +84,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /dotnet/Com.Acme.Foo/Com - + @@ -453,7 +453,7 @@ kwargs = json.loads( "python_requires": "~=3.7", "install_requires": [ "bar>=2.0.0.rc42, <3.0.0", - "jsii>=1337.42.1337, <1338.0.0", + "jsii<0.0.1", "publication>=0.0.3", "typeguard~=2.13.3" ], @@ -595,7 +595,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /dotnet/Com.Acme.Foo/ - + @@ -964,7 +964,7 @@ kwargs = json.loads( "python_requires": "~=3.7", "install_requires": [ "bar>=4.5.6.dev1337, <5.0.0", - "jsii>=1337.42.1337, <1338.0.0", + "jsii<0.0.1", "publication>=0.0.3", "typeguard~=2.13.3" ], @@ -1106,7 +1106,7 @@ exports[`foo@2.0.0-rc.42: /dotnet/Com.Acme.Foo/Com.Acme.Foo.csproj 1`] = - + @@ -1454,7 +1454,7 @@ kwargs = json.loads( }, "python_requires": "~=3.7", "install_requires": [ - "jsii>=1337.42.1337, <1338.0.0", + "jsii<0.0.1", "publication>=0.0.3", "typeguard~=2.13.3" ], @@ -1594,7 +1594,7 @@ exports[`foo@4.5.6-pre.1337: /dotnet/Com.Acme.Foo/Com.Acme.Foo.csproj 1` - + @@ -1942,7 +1942,7 @@ kwargs = json.loads( }, "python_requires": "~=3.7", "install_requires": [ - "jsii>=1337.42.1337, <1338.0.0", + "jsii<0.0.1", "publication>=0.0.3", "typeguard~=2.13.3" ], From 379907397c6ae8d61679e0fc0fca18383cd6c41a Mon Sep 17 00:00:00 2001 From: AWS CDK Team Date: Thu, 16 Mar 2023 15:44:34 +0000 Subject: [PATCH 5/5] chore(release): 1.79.0 --- CHANGELOG.md | 7 +++++++ lerna.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8194cd42..de34eaf2f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.78.1](https://github.com/aws/jsii/compare/v1.78.0...v1.78.1) (2023-03-16) + + +### Bug Fixes + +* **pacmak:** runtime dependency should match pacmak release ([#4013](https://github.com/aws/jsii/issues/4013)) ([37c29f7](https://github.com/aws/jsii/commit/37c29f7c944b9abe9d7f26c313d729f7af6970a8)) + ## [1.78.0](https://github.com/aws/jsii/compare/v1.77.0...v1.78.0) (2023-03-15) diff --git a/lerna.json b/lerna.json index 927d9ce466..165087d461 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "1.78.0" + "version": "1.78.1" }