Skip to content

Commit

Permalink
Revert changes to fix IPyWidget tests (#14431)
Browse files Browse the repository at this point in the history
* Revert "Update version of node inline with pipelines (#14410)"

This reverts commit 6e034ab.

* Revert "Use esbuild for just one test script (#14411)"

This reverts commit cb8910f.

* Revert "Remove unwanted files (#14416)"

This reverts commit bb016df.

* Revert "Updates to npm packages to address npm audi issues (#14418)"

This reverts commit 93e7789.
  • Loading branch information
DonJayamanne authored Oct 4, 2023
1 parent 11de1dc commit 6945152
Show file tree
Hide file tree
Showing 32 changed files with 1,715 additions and 1,673 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/dev-with-python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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.17.1
ENV NODE_VERSION 16.14.2
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion .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.17.1-bullseye-slim
FROM node:16.14.2-bullseye-slim

RUN apt-get -y update
RUN apt-get -y install apt-utils git gnupg2 curl locales ca-certificates sudo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
workflow_dispatch:

env:
NODE_VERSION: 16.17.1
NODE_VERSION: 16.14.2
NPM_VERSION: 8.15.1
PYTHON_VERSION: 3.8
JULIA_VERSION: 1.5.2
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.17.1
v16.14.2
38 changes: 38 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,32 @@
"order": 10
}
},
{
"name": "Perf Tests (*.perf.test.ts)",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"${workspaceFolder}/src/test/testMultiRootWkspc/perfTests",
"--enable-proposed-api",
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test/index.node.js"
],
"env": {
"CI_PYTHON_PATH": "<Python Path>",
"VSC_JUPYTER_PERF_TEST": "1",
"TEST_FILES_SUFFIX": "notebookCellExecution.perf.test",
"VSC_JUPYTER_TEST_TIMEOUT": "60000"
},
"sourceMaps": true,
"outFiles": ["${workspaceFolder}/out/**/*.js", "!${workspaceFolder}/**/node_modules**/*"],
"preLaunchTask": "Compile",
"skipFiles": ["<node_internals>/**"],
"presentation": {
"group": "2_tests",
"order": 12
}
},
{
"name": "Jedi LSP tests",
"type": "extensionHost",
Expand Down Expand Up @@ -335,6 +361,18 @@
"order": 2
}
},
{
"name": "Python: Current File with iPython",
"type": "python",
"request": "launch",
"module": "IPython",
"console": "integratedTerminal",
"args": ["${file}"], // Additional args should be prefixed with a '--' first.
"presentation": {
"group": "3_misc",
"order": 3
}
},
{
"name": "Python: Current File",
"type": "python",
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

### Prerequisites

1. [Node.js](https://nodejs.org/) 16.17.1
1. [Node.js](https://nodejs.org/) 16.14.2
2. [npm](https://www.npmjs.com/) 8.15.1
3. [Python](https://www.python.org/) 3.6 or later
4. Windows, macOS, or Linux
Expand Down
1 change: 0 additions & 1 deletion CodeQL.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Maintained by @rzhao271
path_classifiers:
test:
# Classify all files in the top-level directory src/test as test code.
Expand Down
26 changes: 26 additions & 0 deletions build/ci/addEnvPath.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

#Adds the virtual environment's executable path to json file

import json,sys
import os.path
jsonPath = sys.argv[1]
key = sys.argv[2]

if os.path.isfile(jsonPath):
with open(jsonPath, 'r') as read_file:
data = json.load(read_file)
else:
directory = os.path.dirname(jsonPath)
if not os.path.exists(directory):
os.makedirs(directory)
with open(jsonPath, 'w+') as read_file:
data = {}
data = {}
with open(jsonPath, 'w') as outfile:
if key == 'condaExecPath':
data[key] = sys.argv[3]
else:
data[key] = sys.executable
json.dump(data, outfile, sort_keys=True, indent=4)
9 changes: 9 additions & 0 deletions build/ci/component-gov.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pool:
vmImage: 'ubuntu-latest'

steps:
- task: ComponentGovernanceComponentDetection@0
inputs:
scanType: 'Register'
verbosity: 'Verbose'
alertWarningLevel: 'High'
13 changes: 13 additions & 0 deletions build/ci/static_analysis/credscan/CredScanSuppressions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"tool": "Credential Scanner",
"suppressions": [
{
"file": "src\\test\\datascience\\serverConfigFiles\\jkey.key",
"_justification": "Key file used for testing purposes, it is not a key relating to anything real"
},
{
"file": "src\\test\\datascience\\serverConfigFiles\\remotePassword.py",
"_justification": "The secret in this file used here for testing."
}
]
}
Binary file not shown.
4 changes: 2 additions & 2 deletions build/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
'use strict';

const path = require('path');
exports.ExtensionRootDir = path.dirname(__dirname);
const util = require('./util');
exports.ExtensionRootDir = util.ExtensionRootDir;
exports.isWindows = /^win/.test(process.platform);
exports.isCI = process.env.TF_BUILD !== undefined || process.env.GITHUB_ACTIONS === 'true';
1 change: 1 addition & 0 deletions build/contributedFiles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
Loading

0 comments on commit 6945152

Please sign in to comment.