Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion .github/commands.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
"action": "close",
"reason": "not_planned",
"addLabel": "*caused-by-extension",
"comment": "It looks like this is caused by the Jupyter extension. Please file the issue to the [Jupyter extension repository](https://github.com/microsoft/vscode-jupyter). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
"comment": "It looks like this is caused by the Jupyter extension. Please file the issue to the [Jupyter extension repository](https://github.com/deepnote/vscode-deepnote). Make sure to check their issue reporting template and provide them relevant information such as the extension version you're using. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting) for more information.\n\nHappy Coding!"
},
{
"type": "comment",
Expand Down
6 changes: 3 additions & 3 deletions .github/endgame_plan.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
* [Endgame Template](https://github.com/microsoft/vscode-jupyter/blob/main/.github/endgame_plan.md)
* [Endgame Template](https://github.com/deepnote/vscode-deepnote/blob/main/.github/endgame_plan.md)

## Thursday
- [ ] Ensure that any CI test failures have issues assigned to that area's owner.
- [ ] Work with the build champ to drive the build to green by fixing/disabling tests or pinging area owners to do so.

## Friday
- [ ] Review [Component Governance](https://dev.azure.com/monacotools/Monaco/_componentGovernance/191876) (Click on "microsoft/vscode-jupyter" on that page) and resolve all High/Severe issues.
- [ ] Review [Component Governance](https://dev.azure.com/monacotools/Monaco/_componentGovernance/191876) (Click on "deepnote/vscode-deepnote" on that page) and resolve all High/Severe issues.
- [ ] Focus on resolving `Critical` and `High` priority issues as others will be addressed in the `debt` week.
- [ ] Manually add any repository dependencies (if you can't add manually, refer [here](https://docs.opensource.microsoft.com/tools/cg/features/cgmanifest/)). Only add a cgmanifest.json if the components are not NPM or are not dev only.
Instructions on updating `npm` dependencies in `package.json` & `package-lock.json` can be found [here](https://github.com/microsoft/vscode-jupyter/wiki/Resolving-Component-Governance-and-Dependabot-issues-(updating-package-lock.json)).
Instructions on updating `npm` dependencies in `package.json` & `package-lock.json` can be found [here](https://github.com/deepnote/vscode-deepnote/wiki/Resolving-Component-Governance-and-Dependabot-issues-(updating-package-lock.json)).
- [ ] Create new release branch with format `release/release-YYYY.MM`.
* Note: The release branch is now ready for to be published (or hotfixed)
- [ ] Back on the `main` branch, bump the version in `package.json`.
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
}
},
{
// Run this first: https://github.com/microsoft/vscode-jupyter/blob/main/src/test/datascience/setupTestEnvs.cmd
// Run this first: https://github.com/deepnote/vscode-deepnote/blob/main/src/test/datascience/setupTestEnvs.cmd
// Then specify either a grep below or mark a test as 'test.only' to run the test that's failing.
"name": "Tests (Jupyter+Python Extension installed, *.vscode.test.ts)",
"type": "extensionHost",
Expand Down
6 changes: 3 additions & 3 deletions .vscode/notebooks/CITestResults.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"\n",
"def getRuns():\n",
" runsResponse = requests.get(\n",
" \"https://api.github.com/repos/microsoft/vscode-jupyter/actions/workflows/aggregate-test-results.yml/runs?per_page=50\",\n",
" \"https://api.github.com/repos/deepnote/vscode-deepnote/actions/workflows/aggregate-test-results.yml/runs?per_page=50\",\n",
" headers={\n",
" \"Accept\": \"application/vnd.github+json\",\n",
" \"Authorization\": f\"Bearer {authtoken}\",\n",
Expand Down Expand Up @@ -143,7 +143,7 @@
"\n",
"def getArtifactData(id):\n",
" testResultsResponse = requests.get(\n",
" f\"https://api.github.com/repos/microsoft/vscode-jupyter/actions/artifacts/{id}/zip\",\n",
" f\"https://api.github.com/repos/deepnote/vscode-deepnote/actions/artifacts/{id}/zip\",\n",
" headers={\n",
" \"Accept\": \"application/vnd.github+json\",\n",
" \"Authorization\": f\"Bearer {authtoken}\",\n",
Expand Down Expand Up @@ -311,7 +311,7 @@
"# post to create new github issue\n",
"def createIssue(title, body):\n",
" print(\"Creating issue for \" + title)\n",
" url = 'https://api.github.com/repos/microsoft/vscode-jupyter/issues'\n",
" url = 'https://api.github.com/repos/deepnote/vscode-deepnote/issues'\n",
" data = {\n",
" 'title': title,\n",
" 'body': body,\n",
Expand Down
4 changes: 2 additions & 2 deletions .vscode/notebooks/GithubLabels.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
}
],
"source": [
"repo_jupyter = g.get_repo('microsoft/vscode-jupyter')\n",
"repo_jupyter = g.get_repo('deepnote/vscode-deepnote')\n",
"\n",
"for l in repo_jupyter.get_labels():\n",
" if (l.color == 'c5def5'):\n",
Expand Down Expand Up @@ -114,7 +114,7 @@
}
],
"source": [
"repo_jupyter_internal = g.get_repo('microsoft/vscode-jupyter-internal')\n",
"repo_jupyter_internal = g.get_repo('deepnote/vscode-deepnote-internal')\n",
"\n",
"for l in repo_jupyter_internal.get_labels():\n",
" if (l.color == 'c5def5'):\n",
Expand Down
24 changes: 12 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| `main` branch |
| ------------- |

## | ![Main Build](https://github.com/microsoft/vscode-jupyter/actions/workflows/build-test.yml/badge.svg?branch=main)
## | ![Main Build](https://github.com/deepnote/vscode-deepnote/actions/workflows/build-test.yml/badge.svg?branch=main)

[For contributing to the [Microsoft Python Language Server](https://github.com/Microsoft/python-language-server) see its own repo; for [Pylance](https://github.com/microsoft/pylance-release) see its own repo; for [debugpy](https://github.com/microsoft/debugpy) see its own repo]

Expand All @@ -27,7 +27,7 @@
### Setup

```shell
git clone https://github.com/microsoft/vscode-jupyter
git clone https://github.com/deepnote/vscode-deepnote
cd vscode-jupyter

```
Expand Down Expand Up @@ -201,15 +201,15 @@ be matched against suite and test "names" to be run. By default all tests
are run.

For example, to run only the tests in the `DataScience - Kernels Finder` suite (from
[`src/test/datascience/kernel-launcher/kernelFinder.vscode.test.ts`](https://github.com/microsoft/vscode-jupyter/blob/269e0790f9ef6f1571140f0650c6b5fb844f1940/src/test/datascience/kernel-launcher/kernelFinder.vscode.test.ts))
[`src/test/datascience/kernel-launcher/kernelFinder.vscode.test.ts`](https://github.com/deepnote/vscode-deepnote/blob/269e0790f9ef6f1571140f0650c6b5fb844f1940/src/test/datascience/kernel-launcher/kernelFinder.vscode.test.ts))
you would set the value to `Kernels Finder`.

Be sure to escape any grep-sensitive characters in your suite name.

In some rare cases in the "system" tests the `VSC_JUPYTER_CI_TEST_GREP`
environment variable is ignored. If that happens then you will need to
temporarily modify the `const defaultGrep =` line in
[`src/test/index.ts`](https://github.com/microsoft/vscode-jupyter/blob/de1bfe1cbebc0f4e570dc4ae7e1ca057abb0533e/src/test/index.ts#L62).
[`src/test/index.ts`](https://github.com/deepnote/vscode-deepnote/blob/de1bfe1cbebc0f4e570dc4ae7e1ca057abb0533e/src/test/index.ts#L62).

_Launching from VSCode_

Expand Down Expand Up @@ -269,7 +269,7 @@ well!

### Folder Structure

At a high level we have a bunch of folders. Each high level is described in this wiki [page](https://github.com/microsoft/vscode-jupyter/wiki/Source-Code-Organization)
At a high level we have a bunch of folders. Each high level is described in this wiki [page](https://github.com/deepnote/vscode-deepnote/wiki/Source-Code-Organization)

### Typical workflow

Expand All @@ -282,16 +282,16 @@ Here's an example of a typical workflow:
1. Start VS code Insiders root
1. CTRL+SHIFT+B (run the task `compile`)
1. Make code changes
1. Write and [run](https://github.com/microsoft/vscode-jupyter/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L252) unit tests if appropriate
1. Test with [`Extension`](https://github.com/microsoft/vscode-jupyter/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L6) launch task
1. Write and [run](https://github.com/deepnote/vscode-deepnote/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L252) unit tests if appropriate
1. Test with [`Extension`](https://github.com/deepnote/vscode-deepnote/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L6) launch task
1. Repeat until works in normal extension
1. Test with [`Extension (web)`](https://github.com/microsoft/vscode-jupyter/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L34) launch task
1. Run [jupyter notebook server](https://github.com/microsoft/vscode-jupyter/wiki/Connecting-to-a-remote-Jupyter-server-from-vscode.dev) to use in web testing
1. Test with [`Extension (web)`](https://github.com/deepnote/vscode-deepnote/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L34) launch task
1. Run [jupyter notebook server](https://github.com/deepnote/vscode-deepnote/wiki/Connecting-to-a-remote-Jupyter-server-from-vscode.dev) to use in web testing
1. Repeat until works in web extension
1. Write integration tests and [run](https://github.com/microsoft/vscode-jupyter/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L216) locally.
1. Write integration tests and [run](https://github.com/deepnote/vscode-deepnote/blob/29c4be79f64df1858692321b43c3079bb77bdd69/.vscode/launch.json#L216) locally.
1. Submit PR
1. Check PR output to make sure tests don't fail.
1. Debug [CI test failures](https://github.com/microsoft/vscode-jupyter/wiki/Tests)
1. Debug [CI test failures](https://github.com/deepnote/vscode-deepnote/wiki/Tests)

### Helping others

Expand Down Expand Up @@ -321,7 +321,7 @@ All development is actively done in the `main` branch of the
repository. This allows us to have a
[development build](#development-build) which is expected to be stable at
all times. Once we reach a release candidate, it becomes
our [release branch](https://github.com/microsoft/vscode-jupyter/branches).
our [release branch](https://github.com/deepnote/vscode-deepnote/branches).
At that point only what is in the release branch will make it into the next
release.

Expand Down
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"types": "api.d.ts",
"license": "MIT",
"homepage": "https://github.com/microsoft/vscode-jupyter",
"homepage": "https://github.com/deepnote/vscode-deepnote",
"repository": {
"type": "git",
"url": "https://github.com/Microsoft/vscode-jupyter"
Expand Down
2 changes: 1 addition & 1 deletion build/ci/postInstall.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function fixJupyterLabRenderers() {
}

/**
* Ensures extension loads in safari (https://github.com/microsoft/vscode-jupyter/issues/10621)
* Ensures extension loads in safari (https://github.com/deepnote/vscode-deepnote/issues/10621)
* Some of the regexes are not supported in safari and not required either.
*/
function fixStripComments() {
Expand Down
2 changes: 1 addition & 1 deletion build/conda-nonconda-test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# List of requirements for conda environments that cannot be installed using conda
# Pinned per ipywidget 8 support: https://github.com/microsoft/vscode-jupyter/issues/11598
# Pinned per ipywidget 8 support: https://github.com/deepnote/vscode-deepnote/issues/11598
matplotlib
ipympl
2 changes: 1 addition & 1 deletion build/venv-test-ipywidgets7-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pandas
# Install jupyter itself so we end up with a kernel
jupyter
# List of requirements for conda environments that cannot be installed using conda
# Pinned per ipywidget 8 support: https://github.com/microsoft/vscode-jupyter/issues/11598
# Pinned per ipywidget 8 support: https://github.com/deepnote/vscode-deepnote/issues/11598
ipywidgets==8.1.7
anywidget
matplotlib
Expand Down
2 changes: 1 addition & 1 deletion build/verifyProposedApiUsage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async function getPackageJsonInMainBranch(
tag: string
): Promise<{ enabledApiProposals: string[]; engines: { vscode: string } }> {
// If we can find the latest tag, thats even better.
const url = `https://raw.githubusercontent.com/microsoft/vscode-jupyter/${tag}/package.json`;
const url = `https://raw.githubusercontent.com/deepnote/vscode-deepnote/${tag}/package.json`;
const response = await fetch(url);
return await response.json();
}
Expand Down
4 changes: 2 additions & 2 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
"jupyter.configuration.jupyter.logging.level.warn": "Warning and error messages are logged with this level.",
"jupyter.configuration.jupyter.logging.level.error": "Only error messages are logged with this level.",
"jupyter.configuration.jupyter.logging.level.description": "The logging level the extension logs at.",
"jupyter.configuration.jupyter.experiments.optInto.markdownDescription": "List of experiments to opt into. If empty, the user is assigned the default experiment groups. [Learn more](https://github.com/microsoft/vscode-jupyter/wiki/Experiments).",
"jupyter.configuration.jupyter.experiments.optOutFrom.markdownDescription": "List of experiments to opt out of. If empty, the user is assigned the default experiment groups. [Learn more](https://github.com/microsoft/vscode-jupyter/wiki/Experiments).",
"jupyter.configuration.jupyter.experiments.optInto.markdownDescription": "List of experiments to opt into. If empty, the user is assigned the default experiment groups. [Learn more](https://github.com/deepnote/vscode-deepnote/wiki/Experiments).",
"jupyter.configuration.jupyter.experiments.optOutFrom.markdownDescription": "List of experiments to opt out of. If empty, the user is assigned the default experiment groups. [Learn more](https://github.com/deepnote/vscode-deepnote/wiki/Experiments).",
"jupyter.configuration.jupyter.widgetScriptSources.items.enumDescriptions.0": "Loads widget (javascript) scripts from https://www.jsdelivr.com/",
"jupyter.configuration.jupyter.widgetScriptSources.items.enumDescriptions.1": "Loads widget (javascript) scripts from https://unpkg.com/",
"jupyter.configuration.jupyter.widgetScriptSources.items.custom": "Loads widget (javascript) scripts from a custom CDN, following the provided URL template. ",
Expand Down
4 changes: 2 additions & 2 deletions pythonFiles/aggregateTestResults.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# %%
def getRuns(createdDate):
runsResponse = requests.get(
"https://api.github.com/repos/microsoft/vscode-jupyter/actions/workflows/build-test.yml/runs",
"https://api.github.com/repos/deepnote/vscode-deepnote/actions/workflows/build-test.yml/runs",
params={"created": createdDate, "branch": "main"},
headers={
"Accept": "application/vnd.github+json",
Expand All @@ -36,7 +36,7 @@ def getRuns(createdDate):

def getArtifactData(id):
testResultsResponse = requests.get(
f"https://api.github.com/repos/microsoft/vscode-jupyter/actions/artifacts/{id}/zip",
f"https://api.github.com/repos/deepnote/vscode-deepnote/actions/artifacts/{id}/zip",
headers={
"Accept": "application/vnd.github+json",
"Authorization": f"Bearer {authtoken}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


# This function computes the hash for the code. It must follow the same algorithm as in use here:
# https://github.com/microsoft/vscode-jupyter/blob/312511f3cbd8b2bb5bc70fa9b771429e22d0c258/src/client/datascience/editor-integration/cellhashprovider.ts#L181
# https://github.com/deepnote/vscode-deepnote/blob/312511f3cbd8b2bb5bc70fa9b771429e22d0c258/src/client/datascience/editor-integration/cellhashprovider.ts#L181
def __VSCODE_compute_hash(code, number=0):
hash_digest = _VSCODE_hashlib.sha1(code.encode("utf-8")).hexdigest()
return "<ipython-input-{0}-{1}>".format(number, hash_digest[:12])
Expand Down
2 changes: 1 addition & 1 deletion src/kernels/errors/jupyterWaitForIdleError.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { BaseKernelError } from './types';
*
* Cause:
* Jupyter [session](https://jupyterlab.readthedocs.io/en/stable/api/modules/services.session.html) never returns an 'idle' status message on startup.
* This might happen if the kernel hangs. One such example was this issue: https://github.com/microsoft/vscode-jupyter/issues/10940
* This might happen if the kernel hangs. One such example was this issue: https://github.com/deepnote/vscode-deepnote/issues/10940
*
* Handled by:
* Should show up in the executing cell (if there is one), otherwise a notification will pop up.
Expand Down
6 changes: 3 additions & 3 deletions src/kernels/execution/cellExecution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class CellExecutionFactory {
*
* WARNING: Do not dispose `request: Kernel.IShellFuture` object.
* Even after request.done & execute_reply is sent we could have more messages coming from iopub.
* Further details here https://github.com/microsoft/vscode-jupyter/issues/232 & https://github.com/jupyter/jupyter_client/issues/297
* Further details here https://github.com/deepnote/vscode-deepnote/issues/232 & https://github.com/jupyter/jupyter_client/issues/297
*
*/
export class CellExecution implements ICellExecution, IDisposable {
Expand Down Expand Up @@ -471,7 +471,7 @@ export class CellExecution implements ICellExecution, IDisposable {

// WARNING: Do not dispose `request`.
// Even after request.done & execute_reply is sent we could have more messages coming from iopub.
// We have tests for this & check https://github.com/microsoft/vscode-jupyter/issues/232 & https://github.com/jupyter/jupyter_client/issues/297
// We have tests for this & check https://github.com/deepnote/vscode-deepnote/issues/232 & https://github.com/jupyter/jupyter_client/issues/297

try {
// When the request finishes we are done
Expand All @@ -484,7 +484,7 @@ export class CellExecution implements ICellExecution, IDisposable {
// try {
// // The time from the kernel is more accurate, as that will ignore the network latency.
// // Note: There could be an offset between the time on the kernel and the time on the client.
// // https://github.com/microsoft/vscode-jupyter/issues/14072
// // https://github.com/deepnote/vscode-deepnote/issues/14072
// completedTime = new Date(reply.header.date).getTime();
// } catch {
// //
Expand Down
Loading