Skip to content

Commit c82e780

Browse files
authored
fix: less globals, use python interpreter, fix exports, more tests, always show marimo footer (#41)
1 parent 65c5fc0 commit c82e780

Some content is hidden

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

45 files changed

+3892
-2432
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ This feature is experimental and may have some limitations. Some known limitatio
4444
You can configure the extension using the following settings:
4545

4646
- `marimo.browserType`: Browser to open marimo app (`system` or `embedded`, default: `embedded`)
47-
- `marimo.port`: Default port for marimo server (default: `2718`)
47+
- `marimo.port`: Default port for marimo server (default: `2818`)
4848
- `marimo.enableToken`: Enable token authentication (default: `false`)
4949
- `marimo.tokenPassword`: Token password (default: _empty_)
5050
- `marimo.showTerminal`: Open the terminal when the server starts (default: `false`)
5151
- `marimo.debug`: Enable debug logging (default: `false`)
52-
- `marimo.pythonPath`: Path to python executable (default: _empty_)
52+
- `marimo.pythonPath`: Path to python interpreter (default: the one from python extension)
5353
- `marimo.marimoPath`: Path to marimo executable (default: `marimo`)

biome.json

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"noForEach": {
1515
"level": "off"
1616
}
17+
},
18+
"suspicious": {
19+
"noExplicitAny": "warn"
1720
}
1821
}
1922
},

package.json

+14-25
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,7 @@
1717
],
1818
"icon": "resources/marimo.png",
1919
"activationEvents": [
20-
"onLanguage:python",
21-
"onView:marimo-explorer-running-applications",
22-
"onView:marimo-explorer-applications",
23-
"onCommand:vscode-marimo.startServer",
24-
"onCommand:vscode-marimo.stopServer",
25-
"onCommand:vscode-marimo.stopKernel",
26-
"onCommand:vscode-marimo.restartKernel",
27-
"onCommand:vscode-marimo.edit",
28-
"onCommand:vscode-marimo.run",
29-
"onCommand:vscode-marimo.newMarimoFile",
30-
"onCommand:vscode-marimo.openDocumentation",
31-
"onCommand:vscode-marimo.openInBrowser",
32-
"onCommand:vscode-marimo.openOutputsInBrowser",
33-
"onCommand:vscode-marimo.openOutputsInPanel",
34-
"onCommand:vscode-marimo.showCommands",
35-
"onCommand:vscode-marimo.exportAsCommands",
36-
"onCommand:vscode-marimo.openAsVSCodeNotebook",
37-
"onCommand:vscode-marimo.convertToMarimoApp",
38-
"onCommand:vscode-marimo.reloadBrowser",
39-
"onCommand:vscode-marimo.refresh"
20+
"onLanguage"
4021
],
4122
"repository": {
4223
"type": "git",
@@ -156,6 +137,12 @@
156137
"shortTitle": "View marimo documentation",
157138
"icon": "$(remote-explorer-documentation)"
158139
},
140+
{
141+
"command": "vscode-marimo.showStatus",
142+
"category": "marimo",
143+
"title": "Show marimo status",
144+
"icon": "$(status-bar)"
145+
},
159146
{
160147
"command": "vscode-marimo.openInBrowser",
161148
"category": "marimo",
@@ -355,7 +342,7 @@
355342
},
356343
"marimo.port": {
357344
"type": "number",
358-
"default": 2718,
345+
"default": 2818,
359346
"description": "Default port for marimo server"
360347
},
361348
"marimo.enableToken": {
@@ -381,7 +368,7 @@
381368
"marimo.pythonPath": {
382369
"type": "string",
383370
"default": "",
384-
"description": "Path to python executable"
371+
"description": "Path to python interpreter. By default, it will use the one from python extension"
385372
},
386373
"marimo.marimoPath": {
387374
"type": "string",
@@ -396,7 +383,7 @@
396383
"dev": "pnpm run build --watch",
397384
"lint": "biome check --apply .",
398385
"pack": "vsce package --no-dependencies",
399-
"codegen": "npx openapi-typescript https://raw.githubusercontent.com/marimo-team/marimo/0.6.22/openapi/api.yaml --immutable -o ./src/generated/api.ts",
386+
"codegen": "npx openapi-typescript https://raw.githubusercontent.com/marimo-team/marimo/0.8.22/openapi/api.yaml --immutable -o ./src/generated/api.ts",
400387
"pretest": "pnpm run build && pnpm run lint",
401388
"publish": "vsce publish --no-dependencies",
402389
"publish:pre-release": "vsce publish --no-dependencies --pre-release",
@@ -414,15 +401,17 @@
414401
"@types/ws": "^8.5.12",
415402
"@vscode/test-cli": "^0.0.10",
416403
"@vscode/test-electron": "^2.4.1",
404+
"@vscode/python-extension": "^1.0.5",
417405
"jest-mock-vscode": "^3.0.5",
418406
"node-fetch": "^3.3.2",
419407
"node-html-parser": "^6.1.13",
420-
"openapi-fetch": "^0.12.2",
408+
"openapi-fetch": "^0.9.7",
421409
"openapi-typescript": "^7.4.1",
422410
"tempy": "^3.1.0",
423411
"tsup": "^8.3.0",
424412
"typescript": "^5.5.2",
425413
"vitest": "^2.1.1",
426414
"ws": "^8.17.0"
427-
}
415+
},
416+
"dependencies": {}
428417
}

0 commit comments

Comments
 (0)