Skip to content

Commit c2a5eef

Browse files
committed
Merge remote-tracking branch 'origin/main' into hannes/grn-4913-manage-deepnote-kernels
Signed-off-by: Tomas Kislan <[email protected]>
2 parents 0f3a6e7 + 71dffde commit c2a5eef

29 files changed

+2223
-594
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Default owners for everything in the repository
2-
* @saltenasl @jamesbhobbs @Artmann
2+
* @deepnote/oss-maintainers

SECURITY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Security
2+
3+
Report vulnerabilities to [email protected]. If you need to encrypt your message, use our [PGP key](https://deepnote.com/.well-known/pgp-key.txt).
4+
5+
For full security policy and contact information, see [security policy](https://deepnote.com/.well-known/security.txt)

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: 540 additions & 500 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
@@ -162,6 +162,72 @@
162162
"category": "Deepnote",
163163
"icon": "$(notebook)"
164164
},
165+
{
166+
"command": "deepnote.addSqlBlock",
167+
"title": "%deepnote.commands.addSqlBlock.title%",
168+
"category": "Deepnote",
169+
"icon": "$(database)"
170+
},
171+
{
172+
"command": "deepnote.addBigNumberChartBlock",
173+
"title": "%deepnote.commands.addBigNumberChartBlock.title%",
174+
"category": "Deepnote",
175+
"icon": "$(graph)"
176+
},
177+
{
178+
"command": "deepnote.addInputTextBlock",
179+
"title": "%deepnote.commands.addInputTextBlock.title%",
180+
"category": "Deepnote",
181+
"icon": "$(symbol-text)"
182+
},
183+
{
184+
"command": "deepnote.addInputTextareaBlock",
185+
"title": "%deepnote.commands.addInputTextareaBlock.title%",
186+
"category": "Deepnote",
187+
"icon": "$(note)"
188+
},
189+
{
190+
"command": "deepnote.addInputSelectBlock",
191+
"title": "%deepnote.commands.addInputSelectBlock.title%",
192+
"category": "Deepnote",
193+
"icon": "$(list-selection)"
194+
},
195+
{
196+
"command": "deepnote.addInputSliderBlock",
197+
"title": "%deepnote.commands.addInputSliderBlock.title%",
198+
"category": "Deepnote",
199+
"icon": "$(settings-more-action)"
200+
},
201+
{
202+
"command": "deepnote.addInputCheckboxBlock",
203+
"title": "%deepnote.commands.addInputCheckboxBlock.title%",
204+
"category": "Deepnote",
205+
"icon": "$(check)"
206+
},
207+
{
208+
"command": "deepnote.addInputDateBlock",
209+
"title": "%deepnote.commands.addInputDateBlock.title%",
210+
"category": "Deepnote",
211+
"icon": "$(calendar)"
212+
},
213+
{
214+
"command": "deepnote.addInputDateRangeBlock",
215+
"title": "%deepnote.commands.addInputDateRangeBlock.title%",
216+
"category": "Deepnote",
217+
"icon": "$(calendar)"
218+
},
219+
{
220+
"command": "deepnote.addInputFileBlock",
221+
"title": "%deepnote.commands.addInputFileBlock.title%",
222+
"category": "Deepnote",
223+
"icon": "$(file)"
224+
},
225+
{
226+
"command": "deepnote.addButtonBlock",
227+
"title": "%deepnote.commands.addButtonBlock.title%",
228+
"category": "Deepnote",
229+
"icon": "$(add)"
230+
},
165231
{
166232
"command": "dataScience.ClearCache",
167233
"title": "%jupyter.command.dataScience.clearCache.title%",
@@ -794,6 +860,11 @@
794860
"group": "navigation@0",
795861
"when": "notebookType == 'deepnote'"
796862
},
863+
{
864+
"command": "deepnote.addSqlBlock",
865+
"group": "navigation@1",
866+
"when": "notebookType == 'deepnote'"
867+
},
797868
{
798869
"command": "jupyter.restartkernel",
799870
"group": "navigation/execute@5",
@@ -2301,7 +2372,7 @@
23012372
"fast-deep-equal": "^2.0.1",
23022373
"format-util": "^1.0.5",
23032374
"fs-extra": "^4.0.3",
2304-
"glob": "^7.1.2",
2375+
"glob": "^9.3.5",
23052376
"iconv-lite": "^0.6.3",
23062377
"immer": "^10.1.3",
23072378
"inversify": "^6.0.1",
@@ -2335,7 +2406,6 @@
23352406
"slickgrid": "^2.4.17",
23362407
"stack-trace": "0.0.10",
23372408
"strip-comments": "^2.0.1",
2338-
"styled-components": "^5.2.1",
23392409
"svg-to-pdfkit": "^0.1.8",
23402410
"tailwind-merge": "^3.3.1",
23412411
"tcp-port-used": "^1.0.1",
@@ -2414,6 +2484,7 @@
24142484
"@vscode/zeromq": "^0.2.3",
24152485
"acorn": "^8.9.0",
24162486
"autoprefixer": "^10.4.21",
2487+
"bare-events": "^2.8.1",
24172488
"buffer": "^6.0.3",
24182489
"bufferutil": "^4.0.6",
24192490
"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.views.environments.name": "Environments",

0 commit comments

Comments
 (0)