Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): 1.102.0 #4594

Merged
merged 32 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7b91e7a
chore: upgrade lerna to fix CVE with tar dependency (#4555)
mrgrain Jun 26, 2024
7188e19
chore(deps-dev): Bump mypy from 1.10.0 to 1.10.1 in /packages/jsii-pa…
dependabot[bot] Jun 26, 2024
b0459f1
Merge branch 'main' into merge-back/1.101.0
mergify[bot] Jun 26, 2024
7d88a57
chore(merge-back): 1.101.0 (#4557)
mergify[bot] Jun 26, 2024
d170ef1
chore(deps-dev): Update twine requirement from ~=5.0.0 to ~=5.1.1 in …
dependabot[bot] Jun 27, 2024
0832da1
chore(deps-dev): Bump pip from 24.1 to 24.1.1 in /packages/jsii-pacma…
dependabot[bot] Jun 27, 2024
c1bf3d7
chore(deps): Update setuptools requirement from ~=70.1.0 to ~=70.1.1 …
dependabot[bot] Jul 1, 2024
a5be831
chore(deps): Bump mypy from 1.10.0 to 1.10.1 in /packages/@jsii/pytho…
dependabot[bot] Jul 1, 2024
7f1eb82
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.27 to …
dependabot[bot] Jul 8, 2024
ab1088b
chore(deps): Bump golang.org/x/tools from 0.22.0 to 0.23.0 in /packag…
dependabot[bot] Jul 8, 2024
784e9eb
chore(deps-dev): Bump pip from 24.1.1 to 24.1.2 in /packages/jsii-pac…
dependabot[bot] Jul 8, 2024
b4f9091
chore(deps): Update setuptools requirement from ~=70.1.1 to ~=70.2.0 …
dependabot[bot] Jul 8, 2024
b681ab4
chore(deps): Update setuptools requirement from ~=70.2.0 to ~=70.3.0 …
dependabot[bot] Jul 15, 2024
72f9bfd
chore(deps): Bump xunit from 2.8.1 to 2.9.0 in /packages/@jsii/dotnet…
dependabot[bot] Jul 15, 2024
5f67fde
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.28 to …
dependabot[bot] Jul 15, 2024
4ee891d
chore(deps): Bump xunit.runner.visualstudio from 2.8.1 to 2.8.2 in /p…
dependabot[bot] Jul 15, 2024
9fd1d2e
chore(deps-dev): Bump mypy from 1.10.1 to 1.11.0 in /packages/jsii-pa…
dependabot[bot] Jul 22, 2024
c055796
chore(deps): Bump mypy from 1.10.1 to 1.11.0 in /packages/@jsii/pytho…
dependabot[bot] Jul 22, 2024
b7bf97a
chore(deps): Update pytest requirement from ~=8.2 to ~=8.3 in /packag…
dependabot[bot] Jul 22, 2024
1101292
chore(deps): Bump golang.org/x/tools from 0.22.0 to 0.23.0 in /packag…
dependabot[bot] Jul 24, 2024
403cf2c
chore: use node LTS version for workflows (#4582)
rix0rrr Jul 25, 2024
03d09cb
chore(deps): Update setuptools requirement from ~=70.3.0 to ~=71.1.0 …
dependabot[bot] Jul 25, 2024
7f5472f
chore(deps-dev): Bump pip from 24.1.2 to 24.2 in /packages/jsii-pacma…
dependabot[bot] Jul 29, 2024
38afdc1
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.29 to …
dependabot[bot] Jul 29, 2024
cacdfd0
chore(deps): Update pip requirement from ~=24.1 to ~=24.2 in /package…
dependabot[bot] Jul 29, 2024
562c286
chore(deps-dev): Update mkdocs-awesome-pages-plugin requirement from …
dependabot[bot] Jul 29, 2024
e504b28
chore: document how to add support for a new node major versions (#4590)
iliapolo Jul 29, 2024
baa415a
chore: npm-check-updates && yarn upgrade (#4507)
aws-cdk-automation Jul 29, 2024
2152696
chore: bump setuptools to 70.x (#4583)
rix0rrr Jul 30, 2024
67e7a32
chore(deps-dev): Bump mypy from 1.11.0 to 1.11.1 in /packages/jsii-pa…
dependabot[bot] Jul 31, 2024
7d57bfb
chore: npm-check-updates && yarn upgrade (#4592)
aws-cdk-automation Jul 31, 2024
3bbd994
chore(release): 1.102.0
Aug 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ jobs:
with:
distribution: 'zulu'
java-version: '8'
- name: Set up Node 18
- name: Set up Node LTS
uses: actions/setup-node@v4
with:
cache: yarn
node-version: '18'
node-version: 'lts/*'
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -125,11 +125,11 @@ jobs:
with:
distribution: 'zulu'
java-version: '8'
- name: Set up Node 18
- name: Set up Node LTS
uses: actions/setup-node@v4
with:
cache: yarn
node-version: '18'
node-version: 'lts/*'
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: yarn
node-version: '18'
node-version: 'lts/*'
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Benchmark
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-node@v4
with:
cache: yarn
node-version: 18
node-version: 'lts/*'

- name: Install Tools
run: |-
Expand Down Expand Up @@ -87,8 +87,10 @@ jobs:
--filter=typescript

# Upgrade all other dependencies (devDependencies) to the latest
# Exclude:
# - glob, because newer version don't support Node 18
lerna exec --parallel ncu -- --upgrade --target=latest \
--reject='@types/inquirer,@types/node,typescript,@types/fs-extra,@types/yargs,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'
--reject='@types/inquirer,@types/node,typescript,@types/fs-extra,@types/yargs,glob,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'

# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
- name: Run "yarn install"
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

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.102.0](https://github.com/aws/jsii/compare/v1.101.0...v1.102.0) (2024-08-02)

## [1.101.0](https://github.com/aws/jsii/compare/v1.100.0...v1.101.0) (2024-06-26)


Expand Down
19 changes: 19 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,3 +240,22 @@ be released after a last validation build.

The latest release information (for both of the Docker image tags) can be seen
on [ECR Public Gallery](https://gallery.ecr.aws/jsii/superchain)

## Support for new Node Major versions

When a new major version of node is released, we need to update the `@jsii/check-node` package.
This package is responsible for identifiying which node version is being used by the current process,
whether or not it is supported and tested, and produces appropriate warnings in case it isnt.

> Note that `jsii` will execute on every node version, so "adding support" here only means supressing or showing
> warnings that inform the user on the level of support it has.

### Steps

1. Add a `new NodeRelease(...)` to [constants.ts](./packages/@jsii/check-node/src/constants.ts)
2. If its an LTS version, add the new node version to our testing matrix in [main.yml](./.github/workflows/main.yml) and [docker-images.yml](./.github/workflows/docker-images.yml).

### Useful Resources

- [https://endoflife.date/nodejs](https://endoflife.date/nodejs)
- [Adding support for node 22 PR](https://github.com/aws/jsii/pull/4489)
4 changes: 2 additions & 2 deletions gh-pages/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs~=1.6.0
mkdocs-awesome-pages-plugin~=2.9.2
mkdocs-material~=9.5.27
mkdocs-awesome-pages-plugin~=2.9.3
mkdocs-material~=9.5.30
mkdocs-git-revision-date-plugin~=0.3.2
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"rejectCycles": true
}
},
"version": "1.101.0",
"version": "1.102.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
"@jest/types": "^28.1.3",
"@types/jest": "^29.5.12",
"@types/node": "^14.18.63",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"all-contributors-cli": "^6.26.1",
"eslint": "^9.1.1",
"eslint": "^9.8.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-prettier": "^5.2.1",
"jest": "^29.7.0",
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.1.3",
"lerna": "^8.1.2",
"prettier": "^3.2.5",
"lerna": "^8.1.7",
"prettier": "^3.3.3",
"standard-version": "^9.5.0",
"ts-node": "^10.9.2",
"typescript": "~4.7.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Update="NSubstitute" Version="5.1.0" />
<PackageReference Update="xunit" Version="2.8.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.1" />
<PackageReference Update="xunit" Version="2.9.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.8.2" />
<PackageReference Update="XunitXml.TestLogger" Version="3.1.17" />

<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/check-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
},
"dependencies": {
"chalk": "^4.1.2",
"semver": "^7.6.0"
"semver": "^7.6.3"
}
}
2 changes: 1 addition & 1 deletion packages/@jsii/check-node/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ export class NodeRelease {
untested: true,
}),
new NodeRelease(19, { endOfLife: new Date('2023-06-01'), untested: true }),
new NodeRelease(21, { endOfLife: new Date('2024-06-01'), untested: true }),

// Currently active releases (as of last edit to this file...)
new NodeRelease(18, { endOfLife: new Date('2025-04-30') }),
new NodeRelease(20, { endOfLife: new Date('2026-04-30') }),
new NodeRelease(21, { endOfLife: new Date('2024-06-01'), untested: true }),
new NodeRelease(22, { endOfLife: new Date('2027-04-30') }),

// Future (planned releases)
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/dotnet-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
"@jsii/runtime": "^0.0.0",
"@types/semver": "^7.5.8",
"jsii-build-tools": "^0.0.0",
"semver": "^7.6.0"
"semver": "^7.6.3"
}
}
7 changes: 4 additions & 3 deletions packages/@jsii/go-runtime-test/project/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
github.com/stretchr/testify v1.9.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.22.0
golang.org/x/tools v0.23.0
)

require (
Expand All @@ -21,8 +21,9 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
19 changes: 7 additions & 12 deletions packages/@jsii/go-runtime-test/project/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,23 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
7 changes: 4 additions & 3 deletions packages/@jsii/go-runtime/jsii-runtime-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ require (
github.com/mattn/go-isatty v0.0.20
github.com/stretchr/testify v1.9.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.22.0
golang.org/x/tools v0.23.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
13 changes: 7 additions & 6 deletions packages/@jsii/go-runtime/jsii-runtime-go/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,23 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"jsii-pacmak": "^0.0.0",
"pyright": "^1.1.332"
"pyright": "^1.1.374"
}
}
8 changes: 4 additions & 4 deletions packages/@jsii/python-runtime/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
black~=24.4
mypy==1.10.0
pip~=24.1
pytest~=8.2
mypy==1.11.0
pip~=24.2
pytest~=8.3
pytest-mypy~=0.10
setuptools~=70.1.0
setuptools~=71.1.0
types-python-dateutil~=2.9
wheel~=0.43

Expand Down
8 changes: 4 additions & 4 deletions packages/@jsii/python-runtime/tests/test_compliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -937,10 +937,10 @@ def test_eraseUnsetDataValues():

def test_objectIdDoesNotGetReallocatedWhenTheConstructorPassesThisOut():
class PartiallyInitializedThisConsumerImpl(PartiallyInitializedThisConsumer):
def consume_partially_initialized_this(self, obj, dt, en):
def consume_partially_initialized_this(self, obj, dt, ev):
assert obj is not None
assert isinstance(dt, datetime)
assert en == AllTypesEnum.THIS_IS_GREAT
assert ev == AllTypesEnum.THIS_IS_GREAT
return "OK"

reflector = PartiallyInitializedThisConsumerImpl()
Expand Down Expand Up @@ -1337,8 +1337,8 @@ def test_class_can_be_used_when_not_expressedly_loaded():
"""

class Subject(Cdk16625):
def _unwrap(self, rng: IRandomNumberGenerator):
return rng.next()
def _unwrap(self, gen: IRandomNumberGenerator):
return gen.next()

# This should NOT throw
Subject().test()
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"source-map-loader": "^5.0.0",
"webpack": "^5.91.0",
"webpack": "^5.93.0",
"webpack-cli": "^5.1.4"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"package": "package-js"
},
"dependencies": {
"ajv": "^8.13.0"
"ajv": "^8.17.1"
},
"devDependencies": {
"fs-extra": "^10.1.0",
"jsii-build-tools": "^0.0.0",
"typescript-json-schema": "^0.63.0"
"typescript-json-schema": "^0.64.0"
}
}
7 changes: 5 additions & 2 deletions packages/jsii-pacmak/lib/targets/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ abstract class BaseProperty implements PythonBase {
// PyRight and MyPY both special-case @property, but not custom implementations such as our @classproperty...
// MyPY reports on the re-declaration, but PyRight reports on the initial declaration (duh!)
this.isStatic && !this.immutable
? 'pyright: ignore [reportGeneralTypeIssues]'
? 'pyright: ignore [reportGeneralTypeIssues,reportRedeclaration]'
: undefined,
);
this.generator.emitDocString(code, this.apiLocation, this.docs, {
Expand Down Expand Up @@ -1011,8 +1011,11 @@ abstract class BaseProperty implements PythonBase {
this.pythonName
}`,
);
// In case of a static setter, the 'cls' type is the class type but because we use a custom
// decorator to make the setter operate on classes instead of objects, pyright doesn't know about
// that and thinks the first argument is an instance instead of a class. Shut it up.
code.line(
`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value)`,
`jsii.${this.jsiiSetMethod}(${this.implicitParameter}, "${this.jsName}", value) # pyright: ignore[reportArgumentType]`,
);
} else {
code.line('...');
Expand Down
4 changes: 2 additions & 2 deletions packages/jsii-pacmak/lib/targets/python/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# be installed in the virtual environment used for building the distribution
# package (wheel, sdist), but not declared as build-system dependencies.

setuptools~=67.3.2 # build-system
setuptools~=70.0.0 # build-system
wheel~=0.42 # build-system

twine~=5.0.0
twine~=5.1.1
Loading
Loading