Skip to content

Commit 4738a94

Browse files
Artmannclaude
andcommitted
Merge branch 'main' into devin/1761565458-rename-microsoft-vscode-jupyter
Merged latest changes from main branch including: - New deepnote notebook command listener and tests - File system utilities and tests - Updated dependencies and package configurations - Various test improvements Resolved merge conflict in package-lock.json by accepting main's version and regenerating with npm install. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
2 parents cc0e7a3 + 71dffde commit 4738a94

27 files changed

+2139
-333
lines changed

build/conda-nonconda-test-requirements.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

build/venv-smoke-test-requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/venv-test-ipywidgets7-requirements.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# List of requirements for ipython tests
2-
numpy
2+
numpy>=1.22.2
33
pandas
44
# Install jupyter itself so we end up with a kernel
55
jupyter
@@ -8,3 +8,17 @@ ipywidgets
88
anywidget
99
matplotlib
1010
ipympl
11+
12+
# Security updates for transitive dependencies
13+
pillow>=10.2.0
14+
setuptools>=78.1.1
15+
zipp>=3.19.1
16+
tornado>=6.4.1
17+
anyio>=4.4.0
18+
requests>=2.32.4
19+
fonttools>=4.43.0
20+
jupyter-server>=2.14.1
21+
jupyter-core>=5.8.0
22+
ipython>=8.10.0
23+
urllib3>=2.2.2
24+
jupyterlab>=4.4.8

cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"blockgroup",
2525
"channeldef",
2626
"dataframe",
27+
"datascience",
2728
"deepnote",
2829
"deepnoteserver",
2930
"dntk",

package-lock.json

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

package.json

Lines changed: 73 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,72 @@
109109
"category": "Deepnote",
110110
"icon": "$(notebook)"
111111
},
112+
{
113+
"command": "deepnote.addSqlBlock",
114+
"title": "%deepnote.commands.addSqlBlock.title%",
115+
"category": "Deepnote",
116+
"icon": "$(database)"
117+
},
118+
{
119+
"command": "deepnote.addBigNumberChartBlock",
120+
"title": "%deepnote.commands.addBigNumberChartBlock.title%",
121+
"category": "Deepnote",
122+
"icon": "$(graph)"
123+
},
124+
{
125+
"command": "deepnote.addInputTextBlock",
126+
"title": "%deepnote.commands.addInputTextBlock.title%",
127+
"category": "Deepnote",
128+
"icon": "$(symbol-text)"
129+
},
130+
{
131+
"command": "deepnote.addInputTextareaBlock",
132+
"title": "%deepnote.commands.addInputTextareaBlock.title%",
133+
"category": "Deepnote",
134+
"icon": "$(note)"
135+
},
136+
{
137+
"command": "deepnote.addInputSelectBlock",
138+
"title": "%deepnote.commands.addInputSelectBlock.title%",
139+
"category": "Deepnote",
140+
"icon": "$(list-selection)"
141+
},
142+
{
143+
"command": "deepnote.addInputSliderBlock",
144+
"title": "%deepnote.commands.addInputSliderBlock.title%",
145+
"category": "Deepnote",
146+
"icon": "$(settings-more-action)"
147+
},
148+
{
149+
"command": "deepnote.addInputCheckboxBlock",
150+
"title": "%deepnote.commands.addInputCheckboxBlock.title%",
151+
"category": "Deepnote",
152+
"icon": "$(check)"
153+
},
154+
{
155+
"command": "deepnote.addInputDateBlock",
156+
"title": "%deepnote.commands.addInputDateBlock.title%",
157+
"category": "Deepnote",
158+
"icon": "$(calendar)"
159+
},
160+
{
161+
"command": "deepnote.addInputDateRangeBlock",
162+
"title": "%deepnote.commands.addInputDateRangeBlock.title%",
163+
"category": "Deepnote",
164+
"icon": "$(calendar)"
165+
},
166+
{
167+
"command": "deepnote.addInputFileBlock",
168+
"title": "%deepnote.commands.addInputFileBlock.title%",
169+
"category": "Deepnote",
170+
"icon": "$(file)"
171+
},
172+
{
173+
"command": "deepnote.addButtonBlock",
174+
"title": "%deepnote.commands.addButtonBlock.title%",
175+
"category": "Deepnote",
176+
"icon": "$(add)"
177+
},
112178
{
113179
"command": "dataScience.ClearCache",
114180
"title": "%jupyter.command.dataScience.clearCache.title%",
@@ -736,6 +802,11 @@
736802
"group": "navigation@0",
737803
"when": "notebookType == 'deepnote'"
738804
},
805+
{
806+
"command": "deepnote.addSqlBlock",
807+
"group": "navigation@1",
808+
"when": "notebookType == 'deepnote'"
809+
},
739810
{
740811
"command": "jupyter.restartkernel",
741812
"group": "navigation/execute@5",
@@ -2196,7 +2267,7 @@
21962267
"fast-deep-equal": "^2.0.1",
21972268
"format-util": "^1.0.5",
21982269
"fs-extra": "^4.0.3",
2199-
"glob": "^7.1.2",
2270+
"glob": "^9.3.5",
22002271
"iconv-lite": "^0.6.3",
22012272
"immer": "^10.1.3",
22022273
"inversify": "^6.0.1",
@@ -2230,7 +2301,6 @@
22302301
"slickgrid": "^2.4.17",
22312302
"stack-trace": "0.0.10",
22322303
"strip-comments": "^2.0.1",
2233-
"styled-components": "^5.2.1",
22342304
"svg-to-pdfkit": "^0.1.8",
22352305
"tailwind-merge": "^3.3.1",
22362306
"tcp-port-used": "^1.0.1",
@@ -2309,6 +2379,7 @@
23092379
"@vscode/zeromq": "^0.2.3",
23102380
"acorn": "^8.9.0",
23112381
"autoprefixer": "^10.4.21",
2382+
"bare-events": "^2.8.1",
23122383
"buffer": "^6.0.3",
23132384
"bufferutil": "^4.0.6",
23142385
"chai": "^4.3.10",

package.nls.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,17 @@
253253
"deepnote.commands.newProject.title": "New Project",
254254
"deepnote.commands.importNotebook.title": "Import Notebook",
255255
"deepnote.commands.importJupyterNotebook.title": "Import Jupyter Notebook",
256+
"deepnote.commands.addSqlBlock.title": "Add SQL Block",
257+
"deepnote.commands.addBigNumberChartBlock.title": "Add Big Number Chart Block",
258+
"deepnote.commands.addInputTextBlock.title": "Add Input Text Block",
259+
"deepnote.commands.addInputTextareaBlock.title": "Add Input Textarea Block",
260+
"deepnote.commands.addInputSelectBlock.title": "Add Input Select Block",
261+
"deepnote.commands.addInputSliderBlock.title": "Add Input Slider Block",
262+
"deepnote.commands.addInputCheckboxBlock.title": "Add Input Checkbox Block",
263+
"deepnote.commands.addInputDateBlock.title": "Add Input Date Block",
264+
"deepnote.commands.addInputDateRangeBlock.title": "Add Input Date Range Block",
265+
"deepnote.commands.addInputFileBlock.title": "Add Input File Block",
266+
"deepnote.commands.addButtonBlock.title": "Add Button Block",
256267
"deepnote.views.explorer.name": "Explorer",
257268
"deepnote.views.explorer.welcome": "No Deepnote notebooks found in this workspace.",
258269
"deepnote.command.selectNotebook.title": "Select Notebook"

src/commands.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,15 @@ export interface ICommandNameArgumentTypeMapping {
185185
[DSCommands.InstallPythonExtensionViaKernelPicker]: [];
186186
[DSCommands.InstallPythonViaKernelPicker]: [];
187187
[DSCommands.ContinueEditSessionInCodespace]: [];
188+
[DSCommands.AddSqlBlock]: [];
189+
[DSCommands.AddBigNumberChartBlock]: [];
190+
[DSCommands.AddInputTextBlock]: [];
191+
[DSCommands.AddInputTextareaBlock]: [];
192+
[DSCommands.AddInputSelectBlock]: [];
193+
[DSCommands.AddInputSliderBlock]: [];
194+
[DSCommands.AddInputCheckboxBlock]: [];
195+
[DSCommands.AddInputDateBlock]: [];
196+
[DSCommands.AddInputDateRangeBlock]: [];
197+
[DSCommands.AddInputFileBlock]: [];
198+
[DSCommands.AddButtonBlock]: [];
188199
}

0 commit comments

Comments
 (0)