Skip to content

Commit

Permalink
chore(release): 1.7.0 (#1754)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jun 18, 2020
2 parents 248e75b + f6e50dd commit 179a3a5
Show file tree
Hide file tree
Showing 56 changed files with 689 additions and 282 deletions.
33 changes: 0 additions & 33 deletions .dependabot/config.yml

This file was deleted.

45 changes: 45 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
version: 2

updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
labels:
- dependencies
versioning-strategy: increase
ignore:
- dependency-name: typescript
versions:
- ">= 3.10.a"
- dependency-name: "@types/node"
versions:
- ">= 11.a"

- package-ecosystem: nuget
directory: "/packages/@jsii/dotnet-runtime/src"
schedule:
interval: daily
open-pull-requests-limit: 10
labels:
- dependencies
- language/dotnet

- package-ecosystem: nuget
directory: "/packages/@jsii/dotnet-runtime-test/test"
schedule:
interval: daily
open-pull-requests-limit: 10
labels:
- dependencies
- language/dotnet

- package-ecosystem: pip
directory: "/packages/@jsii/python-runtime"
schedule:
interval: daily
open-pull-requests-limit: 10
labels:
- dependencies
- language/python
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pull_request_rules:
label:
add: [ contribution/core ]
conditions:
- author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo)$
- author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch)$
- -label~="contribution/core"
- name: Tell them we're good now
actions:
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

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.7.0](https://github.com/aws/jsii/compare/v1.6.0...v1.7.0) (2020-06-18)


### Features

* **jsii-pacmak:** add maven and nuget support for * dependencies ([#1696](https://github.com/aws/jsii/issues/1696)) ([13667f6](https://github.com/aws/jsii/commit/13667f6e22a4548c8bcbd9e1c589582f6c3417b5)), closes [aws/jsii#1678](https://github.com/aws/jsii/issues/1678)
* turn off assembly validation ([#1751](https://github.com/aws/jsii/issues/1751)) ([c6d5f8a](https://github.com/aws/jsii/commit/c6d5f8a9d57602c6187374e753dcc1ecd01a93b6))


### Bug Fixes

* **@jsii/runtime:** "maximum call stack size exceeded" in SyncStdio.readLine ([#1717](https://github.com/aws/jsii/issues/1717)) ([6348226](https://github.com/aws/jsii/commit/6348226d9060c0145c62792f04373ed84361dcf9)), closes [aws/aws-cdk#8288](https://github.com/aws/aws-cdk/issues/8288) [aws/aws-cdk#5187](https://github.com/aws/aws-cdk/issues/5187) [aws/aws-cdk#8397](https://github.com/aws/aws-cdk/issues/8397)
* **jsii:** build succeeds using Omit<T, K> ([#1708](https://github.com/aws/jsii/issues/1708)) ([a46fdb1](https://github.com/aws/jsii/commit/a46fdb1110188356ab6ec3188b552a3fe685ca7d)), closes [#1707](https://github.com/aws/jsii/issues/1707)
* **python:** no overload variant of "Factory" matches argument type "object" ([#1716](https://github.com/aws/jsii/issues/1716)) ([eee8ea5](https://github.com/aws/jsii/commit/eee8ea534157823856201478266ca8019b48a22b))
* **python:** reference isomorphism is broken within __init__ ([#1724](https://github.com/aws/jsii/issues/1724)) ([b7be1c6](https://github.com/aws/jsii/commit/b7be1c6efec8867e37192e1df2233331986b11b5)), closes [aws/aws-cdk#8262](https://github.com/aws/aws-cdk/issues/8262)

## [1.6.0](https://github.com/aws/jsii/compare/v1.5.0...v1.6.0) (2020-06-02)


Expand Down
31 changes: 31 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,36 @@ like any other class:
```
- ... and more to come!

## Toolchain

__jsii__ consists of multiple single-purposed programs which can be used to compose various workflows.

> We are considering creating an "umbrella entrypoint" to make it easier to consume.

Name | Stability | Description
-----------------|--------------|-----------------------------------------------------------------------------------
[`jsii`] | Stable | Compiles TypeScript to jsii module
[`jsii-pacmak`] | Stable | Creates ready-to-publish language-specific packages from jsii modules
[`jsii-reflect`] | Stable | Strong-typed reflection library for jsii type systems
[`jsii-diff`] | Stable | API backwards compatibility checker
[`jsii-rosetta`] | Experimental | Transpile code snippets (in docs) from TypeScript to jsii languages
[`jsii-config`] | Experimental | Interactive tool for generating jsii configuration
[`jsii-release`] | Community | Publishes jsii modules to all supported package managers
[`jsii-srcmak`] | Community | Generates relocatable source code in jsii languages from typescript
[`jsii-docgen`] | Community | Generates markdown API documentation for jsii modules

[`jsii`]: https://github.com/aws/jsii/tree/master/packages/jsii
[`jsii-pacmak`]: https://github.com/aws/jsii/tree/master/packages/jsii-pacmak
[`jsii-reflect`]: https://github.com/aws/jsii/tree/master/packages/jsii-reflect
[`jsii-config`]: https://github.com/aws/jsii/tree/master/packages/jsii-config
[`jsii-diff`]: https://github.com/aws/jsii/tree/master/packages/jsii-diff
[`jsii-rosetta`]: https://github.com/aws/jsii/tree/master/packages/jsii-rosetta
[`jsii-release`]: https://github.com/eladb/jsii-release
[`jsii-srcmak`]: https://github.com/eladb/jsii-srcmak
[`jsii-docgen`]: https://github.com/eladb/jsii-docgen

> *"Community"*: a community-maintained project, not officially supported by the jsii team.

## Getting Started

Let's create our first jsii TypeScript module (actual outputs may slightly
Expand Down Expand Up @@ -316,6 +346,7 @@ That's it. You are ready to rock!
See the [configuration](./docs/configuration.md#targets) documentation for more
information on configuring the various targets.


# Contributing

See [CONTRIBUTING](./CONTRIBUTING.md).
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"rejectCycles": true
}
},
"version": "1.6.0"
"version": "1.7.0"
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"eslint": "^7.1.0",
"eslint-import-resolver-node": "^0.3.3",
"eslint": "^7.2.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-plugin-import": "^2.20.2",
"lerna": "^3.22.0",
"eslint-plugin-import": "^2.21.2",
"lerna": "^3.22.1",
"standard-version": "^8.0.0"
},
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<!-- Central configuration of dependency versions for all DotNet packages -->

<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.6.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="3.1.4" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="3.1.4" />

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Update="NSubstitute" Version="4.2.1" />
<PackageReference Update="NSubstitute" Version="4.2.2" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />

<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/dotnet-runtime-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
},
"devDependencies": {
"@jsii/dotnet-runtime": "^0.0.0",
"@types/node": "^10.17.24",
"@types/node": "^10.17.26",
"jsii-calc": "^0.0.0",
"jsii-pacmak": "^0.0.0",
"typescript": "~3.8.3"
"typescript": "~3.9.5"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/dotnet-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
},
"devDependencies": {
"@jsii/runtime": "^0.0.0",
"@types/node": "^10.17.24",
"@types/node": "^10.17.26",
"@types/semver": "^7.2.0",
"jsii-build-tools": "^0.0.0",
"semver": "^7.3.2",
"typescript": "~3.8.3"
"typescript": "~3.9.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<DotNetCliToolReference Include="dotnet-xunit" />
Expand Down
1 change: 1 addition & 0 deletions packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{B88CEA39-359B-45A0-86D6-0BC1FD284BBE}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
..\..\Directory.Build.targets = ..\..\Directory.Build.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{1F4EEFB5-9E4C-4464-9C3B-6729ABB0511E}"
Expand Down
14 changes: 7 additions & 7 deletions packages/@jsii/integ-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
},
"license": "Apache-2.0",
"dependencies": {
"@octokit/rest": "^17.9.2",
"@octokit/rest": "^18.0.0",
"dotenv": "^8.2.0",
"fs-extra": "^9.0.0",
"fs-extra": "^9.0.1",
"jest": "^26.0.1",
"jsii": "^0.0.0",
"jsii-pacmak": "^0.0.0",
Expand All @@ -29,14 +29,14 @@
"devDependencies": {
"@types/dotenv": "^8.2.0",
"@types/fs-extra": "^8.1.0",
"@types/jest": "^25.2.3",
"@types/node": "^10.17.24",
"@types/jest": "^26.0.0",
"@types/node": "^10.17.26",
"@types/tar": "^4.0.3",
"eslint": "^7.1.0",
"eslint": "^7.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-prettier": "^3.1.4",
"prettier": "^1.19.1",
"typescript": "~3.8.3"
"typescript": "~3.9.5"
},
"jest": {
"errorOnDeprecated": true,
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/java-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
},
"devDependencies": {
"@jsii/runtime": "^0.0.0",
"@types/node": "^10.17.24",
"@types/node": "^10.17.26",
"jsii-build-tools": "^0.0.0",
"typescript": "~3.8.3"
"typescript": "~3.9.5"
}
}
12 changes: 6 additions & 6 deletions packages/@jsii/kernel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,27 @@
},
"dependencies": {
"@jsii/spec": "^0.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^9.0.1",
"source-map": "^0.7.3",
"tar": "^6.0.2"
},
"devDependencies": {
"@scope/jsii-calc-base": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/fs-extra": "^8.1.0",
"@types/jest": "^25.2.3",
"@types/jest": "^26.0.0",
"@types/jest-expect-message": "^1.0.2",
"@types/node": "^10.17.24",
"@types/node": "^10.17.26",
"@types/tar": "^4.0.3",
"eslint": "^7.1.0",
"eslint": "^7.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-prettier": "^3.1.4",
"jest": "^26.0.1",
"jest-expect-message": "^1.0.2",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^0.0.0",
"prettier": "^1.19.1",
"typescript": "~3.8.3"
"typescript": "~3.9.5"
},
"jest": {
"collectCoverage": true,
Expand Down
1 change: 0 additions & 1 deletion packages/@jsii/python-runtime/bin/generate-calc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ subprocess.run(
"-m",
"pip",
"install",
"--force-reinstall",
"--upgrade",
]
+
Expand Down
6 changes: 4 additions & 2 deletions packages/@jsii/python-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
"dist-clean": "rm -rf dist",
"build": "cp ../../../README.md . && rm -f jsii-*.whl && npm run generate && npm run deps",
"package": "package-python && package-private",
"test": ".env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy",
"test:update": "UPDATE_DIFF=1 .env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy"
"test": "npm run test:gen && npm run test:run",
"test:gen": ".env/bin/python bin/generate-calc",
"test:run": ".env/bin/py.test -v --mypy",
"test:update": "UPDATE_DIFF=1 npm run test"
},
"dependencies": {
"@jsii/runtime": "^0.0.0"
Expand Down
1 change: 1 addition & 0 deletions packages/@jsii/python-runtime/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pytest
pytest-mypy
.
4 changes: 4 additions & 0 deletions packages/@jsii/python-runtime/src/jsii/_kernel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ def create(
obj.__jsii_ref__ = _callback_till_result(self, response, CreateResponse)
else:
obj.__jsii_ref__ = response

# Register this to the reference map already (so it's available within the rest of the __init__)
_reference_map.register_reference(obj)

return obj.__jsii_ref__

def delete(self, ref: ObjRef) -> None:
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/src/jsii/_kernel/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CreateRequest:
fqn: str
args: List[Any] = attr.Factory(list)
overrides: List[Override] = attr.Factory(list)
interfaces: Optional[List[str]] = attr.Factory(Optional[list])
interfaces: Optional[List[str]] = None


@attr.s(auto_attribs=True, frozen=True, slots=True)
Expand Down
10 changes: 10 additions & 0 deletions packages/@jsii/python-runtime/tests/test_compliance.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
InterfaceCollections,
IInterfaceWithProperties,
IStructReturningDelegate,
Isomorphism,
JsiiAgent,
JSObjectLiteralForInterface,
JSObjectLiteralToNative,
Expand Down Expand Up @@ -1196,3 +1197,12 @@ def test_parameter_named_self_ClassWithSelf():
def test_parameter_named_self_ClassWithSelfKwarg():
subject = ClassWithSelfKwarg(self='Howdy!')
assert subject.props.self == 'Howdy!'


def test_isomorphism_within_constructor():
class Subject(Isomorphism):
def __init__(self):
super().__init__()
assert self == self.myself()

Subject()
Loading

0 comments on commit 179a3a5

Please sign in to comment.