Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/vscode-jupyter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2023.10.1100000000
Choose a base ref
...
head repository: microsoft/vscode-jupyter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing 854 changed files with 43,458 additions and 42,696 deletions.
54 changes: 54 additions & 0 deletions .config/1espt/PipelineAutobaseliningConfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.

pipelines:
283:
retail:
source:
credscan:
lastModifiedDate: 2024-09-08
eslint:
lastModifiedDate: 2024-09-08
psscriptanalyzer:
lastModifiedDate: 2024-09-08
armory:
lastModifiedDate: 2024-09-08
policheck:
lastModifiedDate: 2024-11-27
binary:
credscan:
lastModifiedDate: 2024-09-08
binskim:
lastModifiedDate: 2025-01-17
spotbugs:
lastModifiedDate: 2024-09-08
284:
retail:
source:
credscan:
lastModifiedDate: 2024-09-13
eslint:
lastModifiedDate: 2024-09-13
psscriptanalyzer:
lastModifiedDate: 2024-09-13
armory:
lastModifiedDate: 2024-09-13
policheck:
lastModifiedDate: 2024-12-03
binary:
credscan:
lastModifiedDate: 2024-09-13
binskim:
lastModifiedDate: 2024-09-13
spotbugs:
lastModifiedDate: 2024-09-13
519:
retail:
source:
credscan:
lastModifiedDate: 2024-11-19
eslint:
lastModifiedDate: 2024-11-19
psscriptanalyzer:
lastModifiedDate: 2024-11-19
armory:
lastModifiedDate: 2024-11-19
60 changes: 60 additions & 0 deletions .config/guardian/.gdnbaselines
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"properties": {
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
},
"version": "1.0.0",
"baselines": {
"default": {
"name": "default",
"createdDate": "2025-01-17 04:41:19Z",
"lastUpdatedDate": "2025-01-17 04:41:19Z"
}
},
"results": {
"a9a26db9cf5576a981f215e31276cb1e9b2282ba20405012ab6e2ef8ef3f63e3": {
"signature": "a9a26db9cf5576a981f215e31276cb1e9b2282ba20405012ab6e2ef8ef3f63e3",
"alternativeSignatures": [
"f00f389d656911ea829191aaf821ed82eba2a8d286f42e22c2051abbc2d953a5"
],
"target": "extension/dist/node_modules/zeromq/prebuilds/win32-x64/node.napi.glibc.node",
"memberOf": [
"default"
],
"tool": "binskim",
"ruleId": "BA2008",
"createdDate": "2025-01-17 04:41:19Z",
"expirationDate": "2025-07-06 05:12:23Z",
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-17 05:12:23Z"
},
"06af5765959b21563d8bc882eabe149fc954cf9a938e7021bdaf699534b4b332": {
"signature": "06af5765959b21563d8bc882eabe149fc954cf9a938e7021bdaf699534b4b332",
"alternativeSignatures": [
"0723d8544c9fd931e2cfc558d272597cd8af50ced6a0e4989d9b521bb2ed37e6"
],
"target": "extension/dist/node_modules/zeromqold/prebuilds/win32-x64/node.napi.node",
"memberOf": [
"default"
],
"tool": "binskim",
"ruleId": "BA2008",
"createdDate": "2025-01-17 04:41:19Z",
"expirationDate": "2025-07-06 05:12:23Z",
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-17 05:12:23Z"
},
"940397e69305bc75896a63901390e27b24ae08eb09120e6e1c1676f846aec8ff": {
"signature": "940397e69305bc75896a63901390e27b24ae08eb09120e6e1c1676f846aec8ff",
"alternativeSignatures": [
"f220512395816898b8730bebd27e0e20bced816bc2dc12bd1cb4f97203371222"
],
"target": "extension/dist/node_modules/zeromq/prebuilds/win32-arm64/node.napi.glibc.node",
"memberOf": [
"default"
],
"tool": "binskim",
"ruleId": "BA2008",
"createdDate": "2025-01-17 04:41:51Z",
"expirationDate": "2025-07-06 05:12:23Z",
"justification": "This error is baselined with an expiration date of 180 days from 2025-01-17 05:12:23Z"
}
}
}
6 changes: 2 additions & 4 deletions .devcontainer/dev-with-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:3
ENV NVM_DIR /usr/local/nvm
RUN mkdir -p $NVM_DIR
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
ENV NODE_VERSION 16.14.2
ENV NODE_VERSION 20.17.0
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH

RUN echo "source $NVM_DIR/nvm.sh && \
nvm install $NODE_VERSION && \
nvm alias default $NODE_VERSION && \
nvm use default && \
npm i -g npm@8.15.1" | bash
npm i -g npm@10.8.2" | bash

# Copy environment.yml (if found) to a temp locaition so we update the environment. Also
# copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists.
@@ -40,5 +40,3 @@ RUN git clone https://github.com/romkatv/powerlevel10k $HOME/.oh-my-zsh/custom/t
RUN curl https://raw.githubusercontent.com/DonJayamanne/vscode-jupyter/containerChanges/.devcontainer/.p10k.zsh > ~/.p10k.zsh
RUN echo "# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh." >> ~/.zshrc
RUN echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> ~/.zshrc


6 changes: 2 additions & 4 deletions .devcontainer/dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.169.0/containers/python-3-miniconda/.devcontainer/base.Dockerfile

FROM node:16.14.2-bullseye-slim
FROM node:20.17.0-bullseye-slim

RUN apt-get -y update
RUN apt-get -y install apt-utils git gnupg2 curl locales ca-certificates sudo
@@ -26,7 +26,7 @@ RUN bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "$
RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts

# # Finally install npm
RUN echo "npm i -g npm@8.15.1" | bash
RUN echo "npm i -g npm@10.8.2" | bash

RUN apt install curl -y
RUN sh -c "$(curl -fsSL https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \
@@ -38,5 +38,3 @@ RUN git clone https://github.com/romkatv/powerlevel10k $HOME/.oh-my-zsh/custom/t
RUN curl https://raw.githubusercontent.com/DonJayamanne/vscode-jupyter/containerChanges/.devcontainer/.p10k.zsh > ~/.p10k.zsh
RUN echo "# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh." >> ~/.zshrc
RUN echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> ~/.zshrc


2 changes: 1 addition & 1 deletion .devcontainer/test-linux-x64-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amd64/ubuntu
FROM --platform=linux/amd64 ubuntu

# Setup Python
RUN apt-get update && apt-get install -y python3 python3-pip
2 changes: 1 addition & 1 deletion .devcontainer/test-linux-x64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amd64/ubuntu
FROM --platform=linux/amd64 ubuntu
RUN apt-get update
RUN apt install curl -y
RUN sh -c "$(curl -fsSL https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \
30 changes: 26 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ module.exports = {
'@typescript-eslint/no-floating-promises': [
'error',
{
ignoreVoid: false
ignoreVoid: true
}
],

@@ -122,7 +122,21 @@ module.exports = {
],
'react/jsx-uses-vars': 'error',
'react/jsx-uses-react': 'error',
'no-restricted-imports': ['error', { paths: ['lodash', 'rxjs', 'lodash/noop', 'rxjs/util/noop'] }],
'no-restricted-imports': 'off',
// 'no-restricted-imports': [
'@typescript-eslint/no-restricted-imports': [
'error',
{
paths: ['lodash', 'lodash/noop'],
patterns: [
{
group: ['@jupyterlab/*'],
message: 'Convert to `import type` or dynamic import',
allowTypeImports: true
}
]
}
],
'import/no-restricted-paths': [
'error',
{
@@ -220,7 +234,15 @@ module.exports = {
{
files: ['**/*.test.ts'],
rules: {
'@typescript-eslint/no-explicit-any': 'off'
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-restricted-imports': 'off'
}
},
{
files: ['src/test/**/*.ts'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-restricted-imports': 'off'
}
},
{
@@ -229,7 +251,7 @@ module.exports = {
// Keep the *.d.ts files clean of any linting suppressions.
// These files will be distributed as is as part of the npm package.
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'off'
}
}
],
144 changes: 72 additions & 72 deletions .github/ISSUE_TEMPLATE/2_bug_form.yml
Original file line number Diff line number Diff line change
@@ -4,75 +4,75 @@ labels: [bug]
assignees:
- octocat
body:
- type: markdown
attributes:
value: |
## Before submitting a bug, you may want to check out...
* Troubleshooting on [our wiki](https://github.com/microsoft/vscode-jupyter/wiki)
* Our [Discussions Forum](https://github.com/microsoft/vscode-jupyter/discussions)
- type: markdown
attributes:
value: |
## Bug Form
- type: checkboxes
id: feature-focus
attributes:
label: Applies To
options:
- label: Notebooks (.ipynb files)
- label: Interactive Window and\/or Cell Scripts (.py files with \#%% markers)
- type: textarea
id: what-happened
attributes:
label: What happened?
placeholder: Tell us the steps you took, what you *expected* to happen and what *actually* happened.
validations:
required: true
- type: input
id: vscode-version
attributes:
label: VS Code Version
description: You can copy the contents of Help > About and paste here.
validations:
required: true
- type: input
id: jupyter-version
attributes:
label: Jupyter Extension Version
description: The version can be found at the top of the extension's description in the extensions sidebar.
validations:
required: true
- type: textarea
id: logs
attributes:
label: Jupyter logs
description: Copy and paste all of the text in the Jupyter Output panel available via the ```Jupyter Show Output``` command. This is often critical to help us understand and fix what may have gone wrong!
render: shell
- type: markdown
attributes:
value: |
## The following fields are optional but can help us make a better determination of what may have gone wrong.
- type: input
id: code-and-runtime
attributes:
label: Coding Language and Runtime Version
placeholder: Python v3.8.2, vJulia 1.6, R, etc.
- type: input
id: lang-extension-version
attributes:
label: Language Extension Version (if applicable)
description: Ex. Python Extension. The extension version can be found at the top of the extension's description in the extensions sidebar.
- type: input
id: anaconda-version
attributes:
label: Anaconda Version (if applicable)
description: If applicable, what version of the Anaconda are you using?
- type: dropdown
id: local-remote
attributes:
label: Running Jupyter locally or remotely?
multiple:
options:
- Local
- Remote
- N/A or Not sure
- type: markdown
attributes:
value: |
## Before submitting a bug, you may want to check out...
* Troubleshooting on [our wiki](https://github.com/microsoft/vscode-jupyter/wiki)
* Our [Discussions Forum](https://github.com/microsoft/vscode-jupyter/discussions)
- type: markdown
attributes:
value: |
## Bug Form
- type: checkboxes
id: feature-focus
attributes:
label: Applies To
options:
- label: Notebooks (.ipynb files)
- label: Interactive Window and\/or Cell Scripts (.py files with \#%% markers)
- type: textarea
id: what-happened
attributes:
label: What happened?
placeholder: Tell us the steps you took, what you *expected* to happen and what *actually* happened.
validations:
required: true
- type: input
id: vscode-version
attributes:
label: VS Code Version
description: You can copy the contents of Help > About and paste here.
validations:
required: true
- type: input
id: jupyter-version
attributes:
label: Jupyter Extension Version
description: The version can be found at the top of the extension's description in the extensions sidebar.
validations:
required: true
- type: textarea
id: logs
attributes:
label: Jupyter logs
description: Copy and paste all of the text in the Jupyter Output panel available via the ```Jupyter Show Output``` command. This is often critical to help us understand and fix what may have gone wrong!
render: shell
- type: markdown
attributes:
value: |
## The following fields are optional but can help us make a better determination of what may have gone wrong.
- type: input
id: code-and-runtime
attributes:
label: Coding Language and Runtime Version
placeholder: Python v3.8.2, vJulia 1.6, R, etc.
- type: input
id: lang-extension-version
attributes:
label: Language Extension Version (if applicable)
description: Ex. Python Extension. The extension version can be found at the top of the extension's description in the extensions sidebar.
- type: input
id: anaconda-version
attributes:
label: Anaconda Version (if applicable)
description: If applicable, what version of the Anaconda are you using?
- type: dropdown
id: local-remote
attributes:
label: Running Jupyter locally or remotely?
multiple:
options:
- Local
- Remote
- N/A or Not sure
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: "Help and Support"
- name: 'Help and Support'
url: https://github.com/microsoft/vscode-jupyter/discussions/categories/questions-and-answers
about: "Need help getting something to work, but you're not sure it's worth of submitting an issue? Ask here."
- name: "Chat on Discord"
- name: 'Chat on Discord'
url: https://aka.ms/python-discord
about: 'You can ask for help or chat in the `#jupyter` channel of our microsoft-python Discord server'
Loading