Skip to content

Commit 6a52988

Browse files
iliapoloiliapolo
authored
Merge branch 'main' into merge-back/1.95.0
2 parents f1ff514 + 7426684 commit 6a52988

File tree

20 files changed

+483
-321
lines changed

20 files changed

+483
-321
lines changed

‎.github/workflows/close-stale-issues.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
closed-for-staleness-label: closed-for-staleness
3333

3434
# Issue timing
35-
days-before-stale: 2
36-
days-before-close: 5
35+
days-before-stale: 10
36+
days-before-close: 4
3737
days-before-ancient: 36500
3838

3939
# If you don't want to mark a issue as being ancient based on a

‎.github/workflows/closed-issue-message.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@ jobs:
1313
# These inputs are both required
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1515
message: |
16-
### ⚠️COMMENT VISIBILITY WARNING⚠️
17-
Comments on closed issues are hard for our team to see.
18-
If you need more assistance, please either tag a team member or open a new issue that references this one.
19-
If you wish to keep having a conversation with other community members under this issue feel free to do so.
16+
This issue is now closed. Comments on closed issues are hard for our team to see.
17+
If you need more assistance, please open a new issue that references this one.

‎.mergify/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pull_request_rules:
1111
label:
1212
add: [contribution/core]
1313
conditions:
14-
- author~=^(RomainMuller|rix0rrr|MrArnoldPalmer|iliapolo|madeline-k|comcalvi|kaizencc|corymhall|otaviomacedo|TheRealAmazonKendra|vinayak-kukreja|mrgrain|colifran|mikewrighton|paulhcsun)$
14+
- author~=^(RomainMuller|rix0rrr|iliapolo|comcalvi|kaizencc|corymhall|otaviomacedo|TheRealAmazonKendra|vinayak-kukreja|mrgrain|colifran|mikewrighton|paulhcsun)$
1515
- -label~="contribution/core"
1616
- name: Tell them we're good now
1717
actions:

‎gh-pages/content/compiler-and-rosetta-maintenance.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ built on). This change was designed in [RFC-374], and removes the need for devel
88
to releases still compatible with TypeScript 3.9 without necessarily requiring their dependents to do the same at the
99
same time. Upgrading your `jsii` and `jsii-rosetta` dependencies to `v5.0.x` is transparent to your users.
1010

11-
[RFC-374]: https://github.com/aws/aws-cdk-rfcs/blob/rmuller/jsii-version-unlock/text/0374-jsii-ts-version.md
11+
[RFC-374]: https://github.com/aws/aws-cdk-rfcs/blob/main/text/0374-jsii-ts-version.md
1212

1313
Starting with the `5.0.x` release of `jsii` and `jsii-rosetta`, we are using a new versioning strategy for these two
1414
tools. Going forward we will closely follow new TypeScript compiler releases with new `jsii` and `jsii-rosetta` releases,

‎gh-pages/requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
mkdocs~=1.5.3
22
mkdocs-awesome-pages-plugin~=2.9.2
3-
mkdocs-material~=9.5.9
3+
mkdocs-material~=9.5.12
44
mkdocs-git-revision-date-plugin~=0.3.2

‎packages/@jsii/Directory.Build.targets

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0" />
77
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
88

9-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
9+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
1010
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
1111
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />
1212

1313
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1414
<PackageReference Update="NSubstitute" Version="5.1.0" />
15-
<PackageReference Update="xunit" Version="2.6.6" />
16-
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.6" />
15+
<PackageReference Update="xunit" Version="2.7.0" />
16+
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.7" />
1717
<PackageReference Update="XunitXml.TestLogger" Version="3.1.17" />
1818

1919
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />

‎packages/@jsii/go-runtime-test/project/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/aws/jsii/jsii-calc/go/jcb v0.0.0
88
github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 v3.20.120
99
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
10-
github.com/stretchr/testify v1.8.4
10+
github.com/stretchr/testify v1.9.0
1111
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
1212
golang.org/x/tools v0.18.0
1313
)

‎packages/@jsii/go-runtime-test/project/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1313
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1414
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1515
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
16+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
17+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1618
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
1719
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
1820
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

‎packages/@jsii/go-runtime/jsii-runtime-go/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ require (
88
github.com/mattn/go-isatty v0.0.20
99
github.com/stretchr/testify v1.8.4
1010
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
11-
golang.org/x/tools v0.17.0
11+
golang.org/x/tools v0.18.0
1212
)
1313

1414
require (
1515
github.com/davecgh/go-spew v1.1.1 // indirect
1616
github.com/mattn/go-colorable v0.1.13 // indirect
1717
github.com/pmezard/go-difflib v1.0.0 // indirect
1818
github.com/yuin/goldmark v1.4.13 // indirect
19-
golang.org/x/mod v0.14.0 // indirect
20-
golang.org/x/sys v0.14.0 // indirect
19+
golang.org/x/mod v0.15.0 // indirect
20+
golang.org/x/sys v0.17.0 // indirect
2121
gopkg.in/yaml.v3 v3.0.1 // indirect
2222
)
2323

‎packages/@jsii/go-runtime/jsii-runtime-go/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
2020
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
2121
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
2222
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
23-
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
24-
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
23+
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
24+
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
2525
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2626
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
2727
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -30,12 +30,12 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
3030
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3131
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3232
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
33-
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
34-
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
33+
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
34+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3535
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3636
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
37-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
38-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
37+
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
38+
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
3939
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4040
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4141
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎packages/@jsii/python-runtime/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
black~=23.12
1+
black~=24.2
22
mypy==1.8.0
33
pip~=24.0
44
pytest~=8.0
55
pytest-mypy~=0.10
6-
setuptools~=69.1.0
6+
setuptools~=69.1.1
77
types-python-dateutil~=2.8
88
wheel~=0.42
99

‎packages/@jsii/python-runtime/src/jsii/_kernel/providers/base.py

+17-34
Original file line numberDiff line numberDiff line change
@@ -45,73 +45,56 @@ class BaseProvider(metaclass=abc.ABCMeta):
4545
# much more Pythonic.
4646

4747
@abc.abstractmethod
48-
def load(self, request: LoadRequest) -> LoadResponse:
49-
...
48+
def load(self, request: LoadRequest) -> LoadResponse: ...
5049

5150
@abc.abstractmethod
5251
def getScriptCommand(
5352
self, request: GetScriptCommandRequest
54-
) -> GetScriptCommandResponse:
55-
...
53+
) -> GetScriptCommandResponse: ...
5654

5755
@abc.abstractmethod
58-
def invokeBinScript(self, request: InvokeScriptRequest) -> InvokeScriptResponse:
59-
...
56+
def invokeBinScript(self, request: InvokeScriptRequest) -> InvokeScriptResponse: ...
6057

6158
@abc.abstractmethod
62-
def create(self, request: CreateRequest) -> CreateResponse:
63-
...
59+
def create(self, request: CreateRequest) -> CreateResponse: ...
6460

6561
@abc.abstractmethod
66-
def get(self, request: GetRequest) -> GetResponse:
67-
...
62+
def get(self, request: GetRequest) -> GetResponse: ...
6863

6964
@abc.abstractmethod
70-
def set(self, request: SetRequest) -> SetResponse:
71-
...
65+
def set(self, request: SetRequest) -> SetResponse: ...
7266

7367
@abc.abstractmethod
74-
def sget(self, request: StaticGetRequest) -> GetResponse:
75-
...
68+
def sget(self, request: StaticGetRequest) -> GetResponse: ...
7669

7770
@abc.abstractmethod
78-
def sset(self, request: StaticSetRequest) -> SetResponse:
79-
...
71+
def sset(self, request: StaticSetRequest) -> SetResponse: ...
8072

8173
@abc.abstractmethod
82-
def invoke(self, request: InvokeRequest) -> Union[InvokeResponse, Callback]:
83-
...
74+
def invoke(self, request: InvokeRequest) -> Union[InvokeResponse, Callback]: ...
8475

8576
@abc.abstractmethod
86-
def sinvoke(self, request: StaticInvokeRequest) -> InvokeResponse:
87-
...
77+
def sinvoke(self, request: StaticInvokeRequest) -> InvokeResponse: ...
8878

8979
@abc.abstractmethod
90-
def complete(self, request: CompleteRequest) -> CompleteResponse:
91-
...
80+
def complete(self, request: CompleteRequest) -> CompleteResponse: ...
9281

9382
@abc.abstractmethod
9483
def sync_complete(
9584
self, request: CompleteRequest, response_type: Type[KernelResponse]
96-
) -> Union[InvokeResponse, GetResponse]:
97-
...
85+
) -> Union[InvokeResponse, GetResponse]: ...
9886

9987
@abc.abstractmethod
100-
def delete(self, request: DeleteRequest) -> DeleteResponse:
101-
...
88+
def delete(self, request: DeleteRequest) -> DeleteResponse: ...
10289

10390
@abc.abstractmethod
104-
def begin(self, request: BeginRequest) -> BeginResponse:
105-
...
91+
def begin(self, request: BeginRequest) -> BeginResponse: ...
10692

10793
@abc.abstractmethod
108-
def end(self, request: EndRequest) -> EndResponse:
109-
...
94+
def end(self, request: EndRequest) -> EndResponse: ...
11095

11196
@abc.abstractmethod
112-
def callbacks(self, request: CallbacksRequest) -> CallbacksResponse:
113-
...
97+
def callbacks(self, request: CallbacksRequest) -> CallbacksResponse: ...
11498

11599
@abc.abstractmethod
116-
def stats(self, request: Optional[StatsRequest] = None) -> StatsResponse:
117-
...
100+
def stats(self, request: Optional[StatsRequest] = None) -> StatsResponse: ...

‎packages/@jsii/python-runtime/src/jsii/_kernel/types.py

+5-10
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ class CreateRequest:
7474

7575

7676
@attr.s(auto_attribs=True, frozen=True, slots=True)
77-
class CreateResponse(ObjRef):
78-
...
77+
class CreateResponse(ObjRef): ...
7978

8079

8180
@attr.s(auto_attribs=True, frozen=True, slots=True)
@@ -84,8 +83,7 @@ class DeleteRequest:
8483

8584

8685
@attr.s(auto_attribs=True, frozen=True, slots=True)
87-
class DeleteResponse:
88-
...
86+
class DeleteResponse: ...
8987

9088

9189
@attr.s(auto_attribs=True, frozen=True, slots=True)
@@ -120,8 +118,7 @@ class SetRequest:
120118

121119

122120
@attr.s(auto_attribs=True, frozen=True, slots=True)
123-
class SetResponse:
124-
...
121+
class SetResponse: ...
125122

126123

127124
@attr.s(auto_attribs=True, frozen=True, slots=True)
@@ -175,8 +172,7 @@ class Callback:
175172

176173

177174
@attr.s(auto_attribs=True, frozen=True, slots=True)
178-
class CallbacksRequest:
179-
...
175+
class CallbacksRequest: ...
180176

181177

182178
@attr.s(auto_attribs=True, frozen=True, slots=True)
@@ -207,8 +203,7 @@ class NamingResponse:
207203

208204

209205
@attr.s(auto_attribs=True, frozen=True, slots=True)
210-
class StatsRequest:
211-
...
206+
class StatsRequest: ...
212207

213208

214209
@attr.s(auto_attribs=True, frozen=True, slots=True)

‎packages/@jsii/python-runtime/tests/test_compliance.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,7 @@ def return_struct(self):
11781178

11791179
class IndirectlyImplementsStructReturningDelegate(
11801180
ImplementsStructReturningDelegate
1181-
):
1182-
...
1181+
): ...
11831182

11841183
delegate = IndirectlyImplementsStructReturningDelegate()
11851184
consumer = ConsumePureInterface(delegate)

‎packages/@jsii/python-runtime/tests/test_invoke_bin.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def silence_node_deprecation_warnings():
2424
environ[var] = "1"
2525

2626
# silence this for the next decades
27-
environ[
28-
"JSII_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION"
29-
] = "14,16,18,20,22,24,26,28,30,32,34"
27+
environ["JSII_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION"] = (
28+
"14,16,18,20,22,24,26,28,30,32,34"
29+
)
3030

3131
# Execute the test
3232
yield

‎packages/jsii-pacmak/lib/targets/python.ts

+14
Original file line numberDiff line numberDiff line change
@@ -1700,6 +1700,20 @@ class PythonModule implements PythonType {
17001700

17011701
// Before we write anything else, we need to write out our module headers, this
17021702
// is where we handle stuff like imports, any required initialization, etc.
1703+
1704+
// If multiple packages use the same namespace (in Python, a directory) it
1705+
// depends on how they are laid out on disk if deep imports of multiple packages
1706+
// will succeed. `pip` merges all packages into the same directory, and deep
1707+
// imports work automatically. `bazel` puts packages into different directories,
1708+
// and `import aws_cdk.subpackage` will fail if `aws_cdk/__init__.py` and
1709+
// `aws_cdk/subpackage/__init__.py` are not in the same directory.
1710+
//
1711+
// We can get around this by using `pkgutil` to extend the search path for the
1712+
// current module (`__path__`) with all packages found on `sys.path`.
1713+
code.line('from pkgutil import extend_path');
1714+
code.line('__path__ = extend_path(__path__, __name__)');
1715+
code.line();
1716+
17031717
code.line('import abc');
17041718
code.line('import builtins');
17051719
code.line('import datetime');

‎packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)