Skip to content

Commit dc5cfab

Browse files
committed
Update Github actions to handle Python 3.12
1 parent 9a4aa7e commit dc5cfab

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

.github/workflows/check-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717
uses: actions/checkout@v4
1818
- name: Base Setup
1919
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
20+
- name: Install typing_extension for Python 3.12
21+
shell: bash
22+
run: pip install typing_extensions
2023
- name: Check Release
2124
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
2225
with:

.github/workflows/prep-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
contents: write
3131
steps:
3232
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
33-
33+
- name: Install typing_extension for Python 3.12
34+
shell: bash
35+
run: pip install typing_extensions
3436
- name: Prep Release
3537
id: prep-release
3638
uses: jupyter-server/jupyter_releaser/.github/actions/prep-release@v2

.github/workflows/publish-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
id-token: write
2121
steps:
2222
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
23-
23+
- name: Install typing_extension for Python 3.12
24+
shell: bash
25+
run: pip install typing_extensions
2426
- uses: actions/create-github-app-token@v1
2527
id: app-token
2628
with:

src/command.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,26 @@ export function showCellDiff(
2828
data: ShowDiff.ICommandArgs,
2929
cellFooterTracker: ICellFooterTracker
3030
) {
31-
let diff = createPatchStringDiffModel(data['original_source'], data['diff']);
31+
const diff = createPatchStringDiffModel(
32+
data['original_source'],
33+
data['diff']
34+
);
3235

33-
let mergeView: MergeView;
34-
mergeView = new MergeView({ remote: diff });
36+
const mergeView = new MergeView({ remote: diff });
3537
//
3638
mergeView.addClass('jp-cell-diff');
3739
// Add the classes below to pick up the styling from nbdime.
3840
mergeView.addClass('nbdime-root');
3941
mergeView.addClass('jp-Notebook-diff');
4042
mergeView.hide();
4143

42-
let footer = cellFooterTracker.getFooter(data.cell_id);
44+
const footer = cellFooterTracker.getFooter(data.cell_id);
4345
// Try removing any old widget that exists.
4446
try {
4547
footer?.removeWidget('jp-cell-diff');
46-
} catch {}
48+
} finally {
49+
// Do Nothing
50+
}
4751

4852
footer?.addWidget(mergeView);
4953

@@ -80,8 +84,8 @@ export async function fetchDiff(
8084
*/
8185
export function showCellDiffCommand(cellFooterTracker: ICellFooterTracker) {
8286
return (args: any) => {
83-
let data: ShowDiff.ICommandArgs = args as any;
84-
let cellId = data['cell_id'];
87+
const data: ShowDiff.ICommandArgs = args as any;
88+
const cellId = data['cell_id'];
8589
if (cellId) {
8690
if (data && data['original_source'] && data['diff']) {
8791
showCellDiff(data, cellFooterTracker);

0 commit comments

Comments
 (0)