Skip to content

Commit

Permalink
chore(release): 1.78.1 (#4014)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Mar 16, 2023
2 parents 1041b18 + 3799073 commit 878761e
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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.78.1](https://github.com/aws/jsii/compare/v1.78.0...v1.78.1) (2023-03-16)


### Bug Fixes

* **pacmak:** runtime dependency should match pacmak release ([#4013](https://github.com/aws/jsii/issues/4013)) ([37c29f7](https://github.com/aws/jsii/commit/37c29f7c944b9abe9d7f26c313d729f7af6970a8))

## [1.78.0](https://github.com/aws/jsii/compare/v1.77.0...v1.78.0) (2023-03-15)


Expand Down
2 changes: 1 addition & 1 deletion gh-pages/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs~=1.4.2
mkdocs-awesome-pages-plugin~=2.8.0
mkdocs-material~=9.1.1
mkdocs-material~=9.1.2
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 @@ -10,5 +10,5 @@
"rejectCycles": true
}
},
"version": "1.78.0"
"version": "1.78.1"
}
2 changes: 1 addition & 1 deletion packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Update="XunitXml.TestLogger" Version="3.0.78" />

<PackageReference Update="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
black~=23.1
mypy==1.0.1
mypy==1.1.1
pip~=23.0
pytest~=7.2
pytest-mypy~=0.10
Expand Down
4 changes: 2 additions & 2 deletions packages/jsii-pacmak/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ VERSION=$(node -p "require('./package.json').version.replace(/\\+[0-9a-f]+\$/, '
cat > lib/version.ts <<HERE
// Generated at $(date -u +"%Y-%m-%dT%H:%M:%SZ") by generate.sh
/** The short version number for this JSII compiler (e.g: \`X.Y.Z\`) */
/** The short version number for this jsii-pacmak release (e.g: \`X.Y.Z\`) */
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
export const VERSION: string = '${VERSION}';
/** The qualified version number for this JSII compiler (e.g: \`X.Y.Z (build #######)\`) */
/** The qualified version number for this jsii-pacmak release (e.g: \`X.Y.Z (build #######)\`) */
export const VERSION_DESC = '${VERSION} (build ${commit:0:7}${suffix:-})';
HERE
6 changes: 2 additions & 4 deletions packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as xmlbuilder from 'xmlbuilder';

import { TargetName } from '..';
import * as logging from '../../logging';
import { VERSION } from '../../version';
import { TARGET_FRAMEWORK } from '../dotnet';
import { toNuGetVersionRange, toReleaseVersion } from '../version-utils';
import { DotNetNameUtils } from './nameutils';
Expand Down Expand Up @@ -119,13 +120,10 @@ export class FileGenerator {
const embeddedResource = itemGroup1.ele('EmbeddedResource');
embeddedResource.att('Include', this.tarballFileName);

// Strip " (build abcdef)" from the jsii version
const jsiiVersion = assembly.jsiiVersion.replace(/ .*$/, '');

const itemGroup2 = rootNode.ele('ItemGroup');
const packageReference = itemGroup2.ele('PackageReference');
packageReference.att('Include', 'Amazon.JSII.Runtime');
packageReference.att('Version', toNuGetVersionRange(`^${jsiiVersion}`));
packageReference.att('Version', toNuGetVersionRange(`^${VERSION}`));

dependencies.forEach((value: DotNetDependency) => {
if (value.partOfCompilation) {
Expand Down
9 changes: 2 additions & 7 deletions packages/jsii-pacmak/lib/targets/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { warn } from '../logging';
import { md2rst } from '../markdown';
import { Target, TargetOptions } from '../target';
import { shell } from '../util';
import { VERSION } from '../version';
import { renderSummary, PropertyDefinition } from './_utils';
import {
NamingContext,
Expand Down Expand Up @@ -2080,12 +2081,6 @@ class Package {
);
code.closeFile('README.md');

// Strip " (build abcdef)" from the jsii version
const jsiiVersionSimple = toReleaseVersion(
this.metadata.jsiiVersion.replace(/ .*$/, ''),
TargetName.PYTHON,
);

const setupKwargs = {
name: this.name,
version: this.version,
Expand All @@ -2109,7 +2104,7 @@ class Package {
package_data: packageData,
python_requires: '~=3.7',
install_requires: [
`jsii${toPythonVersionRange(`^${jsiiVersionSimple}`)}`,
`jsii${toPythonVersionRange(`^${VERSION}`)}`,
'publication>=0.0.3',
'typeguard~=2.13.3',
]
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 878761e

Please sign in to comment.