Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: less globals, use python interpreter, fix exports, more tests, always show marimo footer #41

Merged
merged 1 commit into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ This feature is experimental and may have some limitations. Some known limitatio
You can configure the extension using the following settings:

- `marimo.browserType`: Browser to open marimo app (`system` or `embedded`, default: `embedded`)
- `marimo.port`: Default port for marimo server (default: `2718`)
- `marimo.port`: Default port for marimo server (default: `2818`)
- `marimo.enableToken`: Enable token authentication (default: `false`)
- `marimo.tokenPassword`: Token password (default: _empty_)
- `marimo.showTerminal`: Open the terminal when the server starts (default: `false`)
- `marimo.debug`: Enable debug logging (default: `false`)
- `marimo.pythonPath`: Path to python executable (default: _empty_)
- `marimo.pythonPath`: Path to python interpreter (default: the one from python extension)
- `marimo.marimoPath`: Path to marimo executable (default: `marimo`)
3 changes: 3 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"noForEach": {
"level": "off"
}
},
"suspicious": {
"noExplicitAny": "warn"
}
}
},
Expand Down
39 changes: 14 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,7 @@
],
"icon": "resources/marimo.png",
"activationEvents": [
"onLanguage:python",
"onView:marimo-explorer-running-applications",
"onView:marimo-explorer-applications",
"onCommand:vscode-marimo.startServer",
"onCommand:vscode-marimo.stopServer",
"onCommand:vscode-marimo.stopKernel",
"onCommand:vscode-marimo.restartKernel",
"onCommand:vscode-marimo.edit",
"onCommand:vscode-marimo.run",
"onCommand:vscode-marimo.newMarimoFile",
"onCommand:vscode-marimo.openDocumentation",
"onCommand:vscode-marimo.openInBrowser",
"onCommand:vscode-marimo.openOutputsInBrowser",
"onCommand:vscode-marimo.openOutputsInPanel",
"onCommand:vscode-marimo.showCommands",
"onCommand:vscode-marimo.exportAsCommands",
"onCommand:vscode-marimo.openAsVSCodeNotebook",
"onCommand:vscode-marimo.convertToMarimoApp",
"onCommand:vscode-marimo.reloadBrowser",
"onCommand:vscode-marimo.refresh"
"onLanguage"
],
"repository": {
"type": "git",
Expand Down Expand Up @@ -156,6 +137,12 @@
"shortTitle": "View marimo documentation",
"icon": "$(remote-explorer-documentation)"
},
{
"command": "vscode-marimo.showStatus",
"category": "marimo",
"title": "Show marimo status",
"icon": "$(status-bar)"
},
{
"command": "vscode-marimo.openInBrowser",
"category": "marimo",
Expand Down Expand Up @@ -355,7 +342,7 @@
},
"marimo.port": {
"type": "number",
"default": 2718,
"default": 2818,
"description": "Default port for marimo server"
},
"marimo.enableToken": {
Expand All @@ -381,7 +368,7 @@
"marimo.pythonPath": {
"type": "string",
"default": "",
"description": "Path to python executable"
"description": "Path to python interpreter. By default, it will use the one from python extension"
},
"marimo.marimoPath": {
"type": "string",
Expand All @@ -396,7 +383,7 @@
"dev": "pnpm run build --watch",
"lint": "biome check --apply .",
"pack": "vsce package --no-dependencies",
"codegen": "npx openapi-typescript https://raw.githubusercontent.com/marimo-team/marimo/0.6.22/openapi/api.yaml --immutable -o ./src/generated/api.ts",
"codegen": "npx openapi-typescript https://raw.githubusercontent.com/marimo-team/marimo/0.8.22/openapi/api.yaml --immutable -o ./src/generated/api.ts",
"pretest": "pnpm run build && pnpm run lint",
"publish": "vsce publish --no-dependencies",
"publish:pre-release": "vsce publish --no-dependencies --pre-release",
Expand All @@ -414,15 +401,17 @@
"@types/ws": "^8.5.12",
"@vscode/test-cli": "^0.0.10",
"@vscode/test-electron": "^2.4.1",
"@vscode/python-extension": "^1.0.5",
"jest-mock-vscode": "^3.0.5",
"node-fetch": "^3.3.2",
"node-html-parser": "^6.1.13",
"openapi-fetch": "^0.12.2",
"openapi-fetch": "^0.9.7",
"openapi-typescript": "^7.4.1",
"tempy": "^3.1.0",
"tsup": "^8.3.0",
"typescript": "^5.5.2",
"vitest": "^2.1.1",
"ws": "^8.17.0"
}
},
"dependencies": {}
}
Loading
Loading