Skip to content

Merge point release back into main #14171

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.

Sign up for GitHub

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

Merged
David Kutugata (DavidKutu) merged 16 commits into from
Sep 30, 2020
Merged

Merge point release back into main #14171

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8c44490
Port ipykernel install fix to release (#13975)
IanMatthewHuff Sep 17, 2020
b92203a
Merge in changes to release (#13976)
rchiodo Sep 17, 2020
8c4a0ec
Port two fixes to the release branch (#13995)
rchiodo Sep 18, 2020
6cb43d5
add jedi-language-server to 3rd party notices (#13977)
Sep 18, 2020
832025a
disable test_discover_complex_default and (#14024)
Sep 22, 2020
074024c
Upgrade isort to 5.5.3 (#14035) (#14037)
Sep 22, 2020
c1258f0
prepare release (#14042)
Sep 22, 2020
0b41a86
fixed annoying warnings (#14049)
Sep 23, 2020
8d337a7
Cherry pick to address path issues. (#14125)
karthiknadig Sep 28, 2020
5da34fc
Port escape fix to release branch (#14133)
rchiodo Sep 28, 2020
5065d31
update version and changelog (#14139)
Sep 28, 2020
f276e07
Escaping fix broke a number of things (#14145) (#14154)
rchiodo Sep 29, 2020
200e099
Merge branch 'main' into david/mergeReleaseBack
Sep 30, 2020
ec93163
remove leftovers
Sep 30, 2020
c8827ff
import pytest
Sep 30, 2020
77b527b
stop skipping python tests
Sep 30, 2020
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
Prev Previous commit
Next Next commit
remove leftovers
  • Loading branch information
David Kutugata
David Kutugata committed Sep 30, 2020
commit ec931637ff04f5fcf917e7857a26698c5bd3d1ad
1 change: 0 additions & 1 deletion build/ci/templates/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ variables:
npm_config_cache: $(Pipeline.Workspace)/.npm
vmImageMacOS: 'macOS-10.15'
TS_NODE_FILES: true # Temporarily enabled to allow using types from vscode.proposed.d.ts from ts-node (for tests).
VSC_PYTHON_CI_TEST_VSC_CHANNEL: '1.48.0' # Enforce this until https://github.com/microsoft/vscode-test/issues/73 is fixed
4 changes: 1 addition & 3 deletions src/client/datascience/jupyter/kernels/cellExecution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ import {
import { IKernel } from './types';
// tslint:disable-next-line: no-var-requires no-require-imports
const vscodeNotebookEnums = require('vscode') as typeof import('vscode-proposed');
// tslint:disable-next-line: no-require-imports
import escape = require('lodash/escape');

export class CellExecutionFactory {
constructor(
Expand All @@ -48,7 +46,7 @@ export class CellExecutionFactory {
private readonly editorProvider: INotebookEditorProvider,
private readonly appShell: IApplicationShell,
private readonly vscNotebook: IVSCodeNotebook
) { }
) {}

public create(cell: NotebookCell) {
// tslint:disable-next-line: no-use-before-declare
Expand Down