Skip to content

Commit 8ed8f68

Browse files
committed
Merge remote-tracking branch 'origin/main' into rmuller/lazy-friend
2 parents 4b6dac1 + cde3db6 commit 8ed8f68

File tree

9 files changed

+272
-234
lines changed

9 files changed

+272
-234
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"@jest/types": "^28.1.3",
1919
"@types/jest": "^29.5.3",
2020
"@types/node": "^14.18.53",
21-
"@typescript-eslint/eslint-plugin": "^6.0.0",
22-
"@typescript-eslint/parser": "^6.0.0",
21+
"@typescript-eslint/eslint-plugin": "^6.1.0",
22+
"@typescript-eslint/parser": "^6.1.0",
2323
"all-contributors-cli": "^6.26.1",
24-
"eslint": "^8.44.0",
24+
"eslint": "^8.45.0",
2525
"eslint-config-prettier": "^8.8.0",
2626
"eslint-import-resolver-node": "^0.3.7",
2727
"eslint-import-resolver-typescript": "^3.5.5",
@@ -31,7 +31,7 @@
3131
"jest-circus": "^28.1.3",
3232
"jest-config": "^28.1.3",
3333
"jest-expect-message": "^1.1.3",
34-
"lerna": "^7.1.3",
34+
"lerna": "^7.1.4",
3535
"prettier": "^3.0.0",
3636
"standard-version": "^9.5.0",
3737
"ts-node": "^10.9.1",

packages/@jsii/python-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
"jsii-build-tools": "^0.0.0",
4343
"jsii-calc": "^3.20.120",
4444
"jsii-pacmak": "^0.0.0",
45-
"pyright": "^1.1.317"
45+
"pyright": "^1.1.318"
4646
}
4747
}

packages/@jsii/python-runtime/src/jsii/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
stats = kernel.stats
3838

3939

40-
if sys.version_info < (3, 7):
40+
if sys.version_info < (3, 8):
4141
from platform import python_version
4242
import warnings
4343

4444
warnings.warn(
45-
f"WARNING: You are using python release {python_version()}, which has reached end-of-life! Support for EOL Python releases may be dropped in the future. Please consider upgrading to Python >= 3.7 as soon as possible.",
45+
f"WARNING: You are using python release {python_version()}, which has reached end-of-life! Support for EOL Python releases may be dropped in the future. Please consider upgrading to Python >= 3.8 as soon as possible.",
4646
)
4747

4848

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ def test_invoke_script(self, silence_node_deprecation_warnings) -> None:
4444

4545
assert result.returncode == 0
4646
assert result.stdout == b"Hello World!\n"
47-
assert result.stderr == b""
4847

4948
@pytest.mark.skipif(
5049
platform.system() == "Windows",
@@ -56,7 +55,6 @@ def test_invoke_script_with_args(self, silence_node_deprecation_warnings) -> Non
5655

5756
assert result.returncode == 0
5857
assert result.stdout == b"Hello World!\n arguments: arg1, arg2\n"
59-
assert result.stderr == b""
6058

6159
@pytest.mark.skipif(
6260
platform.system() == "Windows",
@@ -70,7 +68,7 @@ def test_invoke_script_with_failure(
7068

7169
assert result.returncode == 3
7270
assert result.stdout == b"Hello World!\n arguments: arg1, fail\n"
73-
assert result.stderr == b"error message to stderr\n"
71+
assert result.stderr.startswith(b"error message to stderr\n")
7472

7573
@pytest.mark.skipif(
7674
platform.system() == "Windows",

packages/@jsii/runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"jsii-build-tools": "^0.0.0",
4545
"jsii-calc": "^3.20.120",
4646
"source-map-loader": "^4.0.1",
47-
"webpack": "^5.88.1",
47+
"webpack": "^5.88.2",
4848
"webpack-cli": "^5.1.4"
4949
}
5050
}

packages/@jsii/spec/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636
"devDependencies": {
3737
"fs-extra": "^10.1.0",
3838
"jsii-build-tools": "^0.0.0",
39-
"typescript-json-schema": "^0.58.1"
39+
"typescript-json-schema": "^0.59.0"
4040
}
4141
}

packages/jsii-pacmak/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"jsii": "^0.0.0",
6666
"jsii-build-tools": "^0.0.0",
6767
"jsii-calc": "^3.20.120",
68-
"pyright": "^1.1.317"
68+
"pyright": "^1.1.318"
6969
},
7070
"keywords": [
7171
"jsii",

tsconfig-base.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"compilerOptions": {
33
"target": "ES2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
44
"module": "commonjs", /* Specify module code generation: 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
5+
"moduleResolution": "Node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
56
"lib": ["es2020", "es2021.WeakRef"], /* Specify library files to be included in the compilation: */
67
"strict": true, /* Enable all strict type-checking options. */
78
"strictPropertyInitialization": true, /* Require all properties be initialized in the constructor. */

yarn.lock

Lines changed: 260 additions & 221 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)