Skip to content

Commit 729de35

Browse files
mergify[bot]mergify[bot]
authored
chore(release): 1.97.0 (#4475)
See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.97.0/CHANGELOG.md)
2 parents 921e240 + c56bb62 commit 729de35

File tree

11 files changed

+122
-48
lines changed

11 files changed

+122
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [1.97.0](https://github.com/aws/jsii/compare/v1.96.0...v1.97.0) (2024-04-08)
6+
7+
8+
### Bug Fixes
9+
10+
* **jsii-pacmak:** fully support the Python Version Identification part of PEP440 ([#4462](https://github.com/aws/jsii/issues/4462)) ([c8483fb](https://github.com/aws/jsii/commit/c8483fb5c3b2efc75a123fd4816859758b8612dd))
11+
512
## [1.96.0](https://github.com/aws/jsii/compare/v1.95.0...v1.96.0) (2024-03-22)
613

714

‎gh-pages/requirements-dev.txt‎

Lines changed: 1 addition & 1 deletion
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.14
3+
mkdocs-material~=9.5.17
44
mkdocs-git-revision-date-plugin~=0.3.2

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"rejectCycles": true
1313
}
1414
},
15-
"version": "1.96.0",
15+
"version": "1.97.0",
1616
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1717
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
1010
github.com/stretchr/testify v1.9.0
1111
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
12-
golang.org/x/tools v0.19.0
12+
golang.org/x/tools v0.20.0
1313
)
1414

1515
require (
@@ -21,8 +21,8 @@ require (
2121
github.com/mattn/go-isatty v0.0.20 // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/yuin/goldmark v1.4.13 // indirect
24-
golang.org/x/mod v0.16.0 // indirect
25-
golang.org/x/sys v0.18.0 // indirect
24+
golang.org/x/mod v0.17.0 // indirect
25+
golang.org/x/sys v0.19.0 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)
2828

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
2828
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
2929
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
3030
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
31+
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
32+
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
3133
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
3234
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
3335
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3436
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
37+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
3538
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3639
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3740
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -42,6 +45,8 @@ golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
4245
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4346
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
4447
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
48+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
49+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4550
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4651
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
4752
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
@@ -50,6 +55,8 @@ golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
5055
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
5156
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
5257
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
58+
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
59+
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
5360
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5461
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5562
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

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

Lines changed: 3 additions & 3 deletions
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.9.0
1010
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
11-
golang.org/x/tools v0.19.0
11+
golang.org/x/tools v0.20.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.16.0 // indirect
20-
golang.org/x/sys v0.18.0 // indirect
19+
golang.org/x/mod v0.17.0 // indirect
20+
golang.org/x/sys v0.19.0 // indirect
2121
gopkg.in/yaml.v3 v3.0.1 // indirect
2222
)
2323

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ 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.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
24-
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
23+
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
24+
golang.org/x/mod v0.17.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=
28-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
28+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
2929
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
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.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
34-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
33+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
34+
golang.org/x/sys v0.19.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.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
38-
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
37+
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
38+
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pip~=24.0
44
pytest~=8.1
55
pytest-mypy~=0.10
66
setuptools~=69.2.0
7-
types-python-dateutil~=2.8
7+
types-python-dateutil~=2.9
88
wheel~=0.43
99

1010
-e .

‎packages/jsii-pacmak/lib/targets/version-utils.ts‎

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -93,42 +93,80 @@ export function toReleaseVersion(
9393
}
9494
switch (target) {
9595
case TargetName.PYTHON:
96+
const baseVersion = `${version.major}.${version.minor}.${version.patch}`;
97+
9698
// Python supports a limited set of identifiers... And we have a mapping table...
9799
// https://packaging.python.org/guides/distributing-packages-using-setuptools/#pre-release-versioning
98-
const [label, sequence, ...rest] = version.prerelease;
99-
if (rest.filter((elt) => elt !== 0).length > 0 || sequence == null) {
100+
const releaseLabels: Record<string, string> = {
101+
alpha: 'a',
102+
beta: 'b',
103+
rc: 'rc',
104+
post: 'post',
105+
dev: 'dev',
106+
pre: 'pre',
107+
};
108+
109+
const validationErrors: string[] = [];
110+
111+
// Ensure that prerelease composed entirely of [label, sequence] pairs
112+
version.prerelease.forEach((elem, idx, arr) => {
113+
const next: string | number | undefined = arr[idx + 1];
114+
if (typeof elem === 'string') {
115+
if (!Object.keys(releaseLabels).includes(elem)) {
116+
validationErrors.push(
117+
`Label ${elem} is not one of ${Object.keys(releaseLabels).join(
118+
',',
119+
)}`,
120+
);
121+
}
122+
if (next === undefined || !Number.isInteger(next)) {
123+
validationErrors.push(
124+
`Label ${elem} must be followed by a positive integer`,
125+
);
126+
}
127+
}
128+
});
129+
130+
if (validationErrors.length > 0) {
100131
throw new Error(
101132
`Unable to map prerelease identifier (in: ${assemblyVersion}) components to python: ${inspect(
102133
version.prerelease,
103-
)}. The format should be 'X.Y.Z-label.sequence', where sequence is a positive integer, and label is "dev", "pre", "alpha", beta", or "rc"`,
134+
)}. The format should be 'X.Y.Z-[label.sequence][.post.sequence][.(dev|pre).sequence]', where sequence is a positive integer and label is one of ${inspect(
135+
Object.keys(releaseLabels),
136+
)}. Validation errors encountered: ${validationErrors.join(', ')}`,
104137
);
105138
}
106-
if (!Number.isInteger(sequence)) {
107-
throw new Error(
108-
`Unable to map prerelease identifier (in: ${assemblyVersion}) to python, as sequence ${inspect(
109-
sequence,
110-
)} is not an integer`,
111-
);
112-
}
113-
const baseVersion = `${version.major}.${version.minor}.${version.patch}`;
114-
// See PEP 440: https://www.python.org/dev/peps/pep-0440/#pre-releases
115-
switch (label) {
116-
case 'dev':
117-
case 'pre':
118-
return `${baseVersion}.dev${sequence}`;
119-
case 'alpha':
120-
return `${baseVersion}.a${sequence}`;
121-
case 'beta':
122-
return `${baseVersion}.b${sequence}`;
123-
case 'rc':
124-
return `${baseVersion}.rc${sequence}`;
125-
default:
126-
throw new Error(
127-
`Unable to map prerelease identifier (in: ${assemblyVersion}) to python, as label ${inspect(
128-
label,
129-
)} is not mapped (only "dev", "pre", "alpha", "beta" and "rc" are)`,
130-
);
131-
}
139+
140+
// PEP440 supports multiple labels in a given version, so
141+
// we should attempt to identify and map as many labels as
142+
// possible from the given prerelease input
143+
// e.g. 1.2.3-rc.123.dev.456.post.789 => 1.2.3.rc123.dev456.post789
144+
const postIdx = version.prerelease.findIndex(
145+
(v) => v.toString() === 'post',
146+
);
147+
const devIdx = version.prerelease.findIndex((v) =>
148+
['dev', 'pre'].includes(v.toString()),
149+
);
150+
const preReleaseIdx = version.prerelease.findIndex((v) =>
151+
['alpha', 'beta', 'rc'].includes(v.toString()),
152+
);
153+
const prereleaseVersion = [
154+
preReleaseIdx > -1
155+
? `${releaseLabels[version.prerelease[preReleaseIdx]]}${
156+
version.prerelease[preReleaseIdx + 1] ?? 0
157+
}`
158+
: undefined,
159+
postIdx > -1
160+
? `post${version.prerelease[postIdx + 1] ?? 0}`
161+
: undefined,
162+
devIdx > -1 ? `dev${version.prerelease[devIdx + 1] ?? 0}` : undefined,
163+
]
164+
.filter((v) => v)
165+
.join('.');
166+
167+
return version.build.length > 0
168+
? `${baseVersion}.${prereleaseVersion}+${version.build.join('.')}`
169+
: `${baseVersion}.${prereleaseVersion}`;
132170
case TargetName.DOTNET:
133171
case TargetName.GO:
134172
case TargetName.JAVA:

‎packages/jsii-pacmak/test/targets/version-utils.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,13 @@ describe(toReleaseVersion, () => {
127127
python:
128128
/Unable to map prerelease identifier \(in: 1\.2\.3-pre\) components to python: \[ 'pre' \]/,
129129
},
130+
'1.2.3-dev.123.0+abc123.foo.bar': {
131+
dotnet: '1.2.3-dev.123.0+abc123.foo.bar',
132+
go: '1.2.3-dev.123.0+abc123.foo.bar',
133+
java: '1.2.3-dev.123.0+abc123.foo.bar',
134+
js: '1.2.3-dev.123.0+abc123.foo.bar',
135+
python: '1.2.3.dev123+abc123.foo.bar',
136+
},
130137
'1.2.3-alpha.1337': {
131138
dotnet: '1.2.3-alpha.1337',
132139
go: '1.2.3-alpha.1337',
@@ -148,6 +155,21 @@ describe(toReleaseVersion, () => {
148155
js: '1.2.3-rc.9',
149156
python: '1.2.3.rc9',
150157
},
158+
'1.2.3-rc.123.post.456.dev.789': {
159+
dotnet: '1.2.3-rc.123.post.456.dev.789',
160+
go: '1.2.3-rc.123.post.456.dev.789',
161+
java: '1.2.3-rc.123.post.456.dev.789',
162+
js: '1.2.3-rc.123.post.456.dev.789',
163+
python: '1.2.3.rc123.post456.dev789',
164+
},
165+
'1.2.3-rc.alpha': {
166+
dotnet: '1.2.3-rc.alpha',
167+
go: '1.2.3-rc.alpha',
168+
java: '1.2.3-rc.alpha',
169+
js: '1.2.3-rc.alpha',
170+
python:
171+
/Unable to map prerelease identifier \(in: 1.2.3-rc.alpha\) components to python: \[ 'rc', 'alpha' \]/,
172+
},
151173
};
152174

153175
for (const [version, targets] of Object.entries(examples)) {

0 commit comments

Comments
 (0)