Skip to content

Commit 6712006

Browse files
ArtmannArtmann
authored
Merge branch 'main' into dependabot/github_actions/actions/upload-artifact-5.0.0
2 parents e362007 + dcf159d commit 6712006

File tree

195 files changed

+5531
-3534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+5531
-3534
lines changed

‎.eslintrc.js‎ renamed to ‎.eslintrc.cjs‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = {
4747
'@typescript-eslint/no-explicit-any': 'error',
4848
'@typescript-eslint/no-non-null-assertion': 'off',
4949
'no-unused-vars': 'off',
50-
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '_\\w*' }],
50+
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '_\\w*', varsIgnorePattern: '_\\w*' }],
5151
'no-use-before-define': 'off',
5252
'@typescript-eslint/no-use-before-define': [
5353
'error',
@@ -74,7 +74,14 @@ module.exports = {
7474
'import/no-unresolved': [
7575
'error',
7676
{
77-
ignore: ['monaco-editor', 'vscode', 'react-error-boundary']
77+
ignore: [
78+
'monaco-editor',
79+
'vscode',
80+
'react-error-boundary',
81+
'vega-lite',
82+
'vega-embed',
83+
'why-is-node-running'
84+
]
7885
}
7986
],
8087
'import/prefer-default-export': 'off',
@@ -225,18 +232,32 @@ module.exports = {
225232
'import/no-restricted-paths': ['off']
226233
}
227234
},
235+
{
236+
files: ['src/kernels/**/*.ts'],
237+
rules: {
238+
'@typescript-eslint/no-restricted-imports': 'off'
239+
}
240+
},
241+
{
242+
files: ['src/notebooks/**/*.ts', 'src/webviews/**/*.ts'],
243+
rules: {
244+
'@typescript-eslint/no-restricted-imports': 'off'
245+
}
246+
},
228247
{
229248
files: ['**/*.test.ts'],
230249
rules: {
231250
'@typescript-eslint/no-explicit-any': 'off',
232-
'@typescript-eslint/no-restricted-imports': 'off'
251+
'@typescript-eslint/no-restricted-imports': 'off',
252+
'@typescript-eslint/no-empty-function': 'off'
233253
}
234254
},
235255
{
236256
files: ['src/test/**/*.ts'],
237257
rules: {
238258
'@typescript-eslint/no-explicit-any': 'off',
239-
'@typescript-eslint/no-restricted-imports': 'off'
259+
'@typescript-eslint/no-restricted-imports': 'off',
260+
'@typescript-eslint/no-empty-function': 'off'
240261
}
241262
},
242263
{

‎.github/ISSUE_TEMPLATE/1_bug_report.md‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@ labels: bug
88

99
## Environment data
1010

11-
- VS Code version: XXX
12-
- Jupyter Extension version (available under the Extensions sidebar): XXX
13-
- Python Extension version (available under the Extensions sidebar): XXX
14-
- OS (Windows | Mac | Linux distro) and version: XXX
15-
- Python and/or Anaconda version: XXX
16-
- Type of virtual environment used (N/A | venv | virtualenv | conda | ...): XXX
17-
- Jupyter server running: Local | Remote | N/A
11+
- VS Code version: XXX
12+
- Deepnote Extension version (available under the Extensions sidebar): XXX
13+
- OS (Windows | Mac | Linux distro) and version: XXX
14+
- Python and/or Anaconda version: XXX
1815

1916
## Expected behaviour
2017

@@ -38,7 +35,7 @@ Note: If you think a GIF of what is happening would be helpful, consider tools l
3835

3936
<details>
4037

41-
<summary>Output for <code>Jupyter</code> in the <code>Output</code> panel (<code>View</code>→<code>Output</code>, change the drop-down the upper-right of the <code>Output</code> panel to <code>Jupyter</code>)
38+
<summary>Output for <code>Deepnote</code> in the <code>Output</code> panel (<code>View</code>→<code>Output</code>, change the drop-down the upper-right of the <code>Output</code> panel to <code>Deepnote</code>)
4239
</summary>
4340

4441
<p>

‎.github/ISSUE_TEMPLATE/2_bug_form.yml‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body:
1919
attributes:
2020
label: Applies To
2121
options:
22-
- label: Notebooks (.ipynb files)
22+
- label: Notebooks (.deepnote files)
2323
- label: Interactive Window and\/or Cell Scripts (.py files with \#%% markers)
2424
- type: textarea
2525
id: what-happened
@@ -36,17 +36,17 @@ body:
3636
validations:
3737
required: true
3838
- type: input
39-
id: jupyter-version
39+
id: deepnote-version
4040
attributes:
41-
label: Jupyter Extension Version
41+
label: Deepnote Extension Version
4242
description: The version can be found at the top of the extension's description in the extensions sidebar.
4343
validations:
4444
required: true
4545
- type: textarea
4646
id: logs
4747
attributes:
48-
label: Jupyter logs
49-
description: Copy and paste all of the text in the Jupyter Output panel available via the ```Jupyter Show Output``` command. This is often critical to help us understand and fix what may have gone wrong!
48+
label: Deepnote logs
49+
description: Copy and paste all of the text in the Deepnote Output panel available via the ```Deepnote Show Output``` command. This is often critical to help us understand and fix what may have gone wrong!
5050
render: shell
5151
- type: markdown
5252
attributes:
@@ -57,22 +57,3 @@ body:
5757
attributes:
5858
label: Coding Language and Runtime Version
5959
placeholder: Python v3.8.2, vJulia 1.6, R, etc.
60-
- type: input
61-
id: lang-extension-version
62-
attributes:
63-
label: Language Extension Version (if applicable)
64-
description: Ex. Python Extension. The extension version can be found at the top of the extension's description in the extensions sidebar.
65-
- type: input
66-
id: anaconda-version
67-
attributes:
68-
label: Anaconda Version (if applicable)
69-
description: If applicable, what version of the Anaconda are you using?
70-
- type: dropdown
71-
id: local-remote
72-
attributes:
73-
label: Running Jupyter locally or remotely?
74-
multiple:
75-
options:
76-
- Local
77-
- Remote
78-
- N/A or Not sure

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
timeout-minutes: 15
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
25+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2626

2727
- name: Setup Node.js
2828
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -45,7 +45,7 @@ jobs:
4545
timeout-minutes: 15
4646
steps:
4747
- name: Checkout
48-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
48+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
4949

5050
- name: Setup Node.js
5151
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -66,7 +66,7 @@ jobs:
6666

6767
steps:
6868
- name: Checkout code
69-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
69+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
7070
with:
7171
fetch-depth: 0
7272

@@ -88,7 +88,7 @@ jobs:
8888
contents: read
8989
steps:
9090
- name: Checkout
91-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
91+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
9292

9393
- name: Setup Node.js
9494
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -134,7 +134,7 @@ jobs:
134134
runs-on: ubuntu-latest
135135
steps:
136136
- name: Checkout
137-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
137+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
138138

139139
- name: Setup Node.js
140140
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -154,7 +154,7 @@ jobs:
154154
timeout-minutes: 15
155155
steps:
156156
- name: Checkout
157-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
157+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
158158

159159
- name: Setup Node.js
160160
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -174,7 +174,7 @@ jobs:
174174
timeout-minutes: 5
175175
steps:
176176
- name: Checkout
177-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
177+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
178178

179179
- name: Setup Node.js
180180
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -195,7 +195,7 @@ jobs:
195195
timeout-minutes: 15
196196
steps:
197197
- name: Checkout
198-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
198+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
199199

200200
- name: Setup Node.js
201201
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -215,7 +215,7 @@ jobs:
215215
timeout-minutes: 15
216216
steps:
217217
- name: Checkout
218-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
218+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
219219

220220
- name: Setup Node.js
221221
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# If you do not check out your code, Copilot will do this for you.
3636
steps:
3737
- name: Checkout code
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
38+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
3939

4040
- name: Use Node ${{env.NODE_VERSION}}
4141
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -73,7 +73,7 @@ jobs:
7373
continue-on-error: true
7474

7575
- name: Install uv
76-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7
76+
uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7
7777

7878
- name: Setup Venv
7979
run: |

‎.github/workflows/deps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
23+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2424

2525
- name: Setup Node.js
2626
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
52+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
5353

5454
- name: Setup Node.js
5555
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6

‎.github/workflows/package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
timeout-minutes: 20
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
2525

2626
- name: Setup Node.js
2727
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ tmp
7373
vscode.d.ts
7474
vscode.proposed.*.d.ts
7575
xunit-test-results.xml
76+
tsconfig.tsbuildinfo

‎.prettierrc.js‎ renamed to ‎.prettierrc.cjs‎

File renamed without changes.

‎.vscode/tasks.json‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,36 @@
66
"focus": false,
77
"panel": "shared"
88
},
9+
"problemMatchers": [
10+
{
11+
"name": "esbuild-watch",
12+
"label": "esbuild watch",
13+
"owner": "esbuild",
14+
"source": "esbuild",
15+
"fileLocation": "relative",
16+
"pattern": [
17+
{
18+
"regexp": "^\\s*(.*):(\\d+):(\\d+):\\s+(error|warning):\\s+(.*)$",
19+
"file": 1,
20+
"line": 2,
21+
"column": 3,
22+
"severity": 4,
23+
"message": 5
24+
}
25+
],
26+
"background": {
27+
"activeOnStart": true,
28+
"beginsPattern": "^\\[watch\\] build started",
29+
"endsPattern": "^\\[watch\\] build (finished|failed)"
30+
}
31+
}
32+
],
933
"tasks": [
1034
{
1135
"label": "Build",
1236
"dependsOn": [
13-
"Core - Build",
14-
"Unittest - Build"
37+
"Core - Build Once",
38+
"Unittest - Build Once"
1539
],
1640
"presentation": {
1741
"reveal": "never",
@@ -22,13 +46,33 @@
2246
},
2347
"problemMatcher": []
2448
},
49+
{
50+
"type": "npm",
51+
"script": "esbuild-all",
52+
"group": "build",
53+
"problemMatcher": [],
54+
"label": "Core - Build Once",
55+
"presentation": {
56+
"reveal": "never"
57+
}
58+
},
59+
{
60+
"type": "npm",
61+
"script": "compile-tsc",
62+
"group": "build",
63+
"problemMatcher": "$tsc",
64+
"label": "Unittest - Build Once",
65+
"presentation": {
66+
"reveal": "never"
67+
}
68+
},
2569
{
2670
"type": "npm",
2771
"script": "compile-esbuild-watch",
2872
"group": "build",
2973
"problemMatcher": "$esbuild-watch",
3074
"isBackground": true,
31-
"label": "Core - Build",
75+
"label": "Core - Watch",
3276
"presentation": {
3377
"group": "buildWatchers",
3478
"reveal": "never"
@@ -40,7 +84,7 @@
4084
"group": "build",
4185
"problemMatcher": "$tsc-watch",
4286
"isBackground": true,
43-
"label": "Unittest - Build",
87+
"label": "Unittest - Watch",
4488
"presentation": {
4589
"group": "buildWatchers",
4690
"reveal": "never"

0 commit comments

Comments
 (0)