point release back to main #6301

DavidKutu · 2021-06-15T21:33:34Z

Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
Title summarizes what is changing.
Has a news entry file (remember to thank yourself!).
Appropriate comments and documentation strings in the code.
Has sufficient logging.
Has telemetry for enhancements.
Unit tests & system/integration tests are added/updated.
Test plan is updated as appropriate.
package-lock.json has been regenerated by running npm install (if dependencies have changed).

* release candidate * Memorial Day API changes (#6056) * update changelog Co-authored-by: Ian Huff <ianhu@microsoft.com>

* change version to 2021.6.x * match packagejson and changelog versions * 6/2 API Changes (#6089) Co-authored-by: Ian Huff <ianhu@microsoft.com>

* Remove our Run Above/Below commands (#6026) * Update changelog

* update version to 2021.6.99 to be able to filter update changelog * update package lock and VSCode api * don * remove api changes in the code

* Fix test failures resulting from VSCodes Notebook Start page (#6111) * Disable kernel auto startup in untrusted workspace (#6088) * Disable kernel auto startup in untrusted workspace * Fixes * Misc * oops * misc * Fixes to breaking tests (#6074) Co-authored-by: Don Jayamanne <don.jayamanne@outlook.com>

* add component governance file * remove npm components

* final update * update changelog

…-jupyter into release-2021.06

* Contribute shift+enter, ctrl+enter, L, shift+L (#6205) * Ctrl+Enter should put cell into command mode after executing (#6231) * Update CHANGELOG and remove news

* Fix Restarting kernel... test (#6267) * wait for the restart command * add news file * update changelog

* -update version -update changelog * leave version as it was

… in command mode (#6293)

IanMatthewHuff · 2021-06-15T23:03:11Z

src/client/datascience/notebook/helpers/helpers.ts

@@ -560,7 +560,8 @@ function translateDisplayDataOutput(
        items.push(new NotebookCellOutputItem(convertJupyterOutputToBuffer(key, data[key]), key));
    }

-    return new NotebookCellOutput(sortOutputItemsBasedOnDisplayOrder(items), metadata);
+    const x = sortOutputItemsBasedOnDisplayOrder(items);


I think @DonJayamanne just converted this the other way in main if I recall correctly. I don't think that we want this file changed.

Yup I'd remove the variable x

IanMatthewHuff

Approved per the change that Don mentioned.

codecov-commenter · 2021-06-16T17:37:00Z

Codecov Report

Merging #6301 (ee513c2) into main (d8a42ac) will decrease coverage by 0%.
The diff coverage is 100%.

❗ Current head ee513c2 differs from pull request most recent head 6ec0b94. Consider uploading reports for the commit 6ec0b94 to get more accurate results

@@          Coverage Diff           @@
##            main   #6301    +/-   ##
======================================
- Coverage     72%     71%    -1%     
======================================
  Files        401     401            
  Lines      27052   27053     +1     
  Branches    3987    3987            
======================================
- Hits       19538   19425   -113     
- Misses      5866    5995   +129     
+ Partials    1648    1633    -15

Impacted Files	Coverage Δ
src/client/datascience/notebook/helpers/helpers.ts	`72% <100%> (+<1%)`	⬆️
...ience/variablesView/variableViewMessageListener.ts	`22% <0%> (-78%)`	⬇️
...ent/common/application/webviewViews/webviewView.ts	`14% <0%> (-72%)`	⬇️
...c/client/datascience/variablesView/variableView.ts	`18% <0%> (-58%)`	⬇️
src/client/datascience/webviews/webviewViewHost.ts	`19% <0%> (-53%)`	⬇️
...on/application/webviewViews/webviewViewProvider.ts	`80% <0%> (-20%)`	⬇️
.../datascience/variablesView/variableViewProvider.ts	`65% <0%> (-16%)`	⬇️
...lient/datascience/variablesView/notebookWatcher.ts	`80% <0%> (-12%)`	⬇️
src/client/datascience/kernel-launcher/types.ts	`48% <0%> (-8%)`	⬇️
src/client/datascience/webviews/webviewHost.ts	`80% <0%> (-7%)`	⬇️
... and 14 more

David Kutugata and others added 30 commits June 1, 2021 22:15

release candidate (#6059)

ce4ecee

* release candidate * Memorial Day API changes (#6056) * update changelog Co-authored-by: Ian Huff <ianhu@microsoft.com>

Memorial Day API changes (#6056)

f06514a

Send only error type in reason (#6067)

a27123e

Fallback for sys.prefix not being returned by Python extension (#6053)

c54ee58

Fixes to toggling output (#6068)

0eebd84

Better telemetry when we don't find a matching kernel (#6060)

4fc7118

Better data when fail to find kernel connection (#6070)

893ea7f

Merge pull request #6071 from microsoft/mergeJuneCherryPick

34b845c

change version and API port (#6085)

3e7672e

* change version to 2021.6.x * match packagejson and changelog versions * 6/2 API Changes (#6089) Co-authored-by: Ian Huff <ianhu@microsoft.com>

Port #6025 to release (#6103)

06f396a

* Remove our Run Above/Below commands (#6026) * Update changelog

Fix pervasive test issue with editor properties (#6100) (#6106)

d71f56e

update version to 2021.6.99 to be able to filter (#6122)

f8f7907

* update version to 2021.6.99 to be able to filter update changelog * update package lock and VSCode api * don * remove api changes in the code

Breaking changes ports to release (2 commits) (#6140)

728afea

add component governance file (#6166)

83b0d39

* add component governance file * remove npm components

Cherry pick changes from main branch into release (#6174)

bde5192

final update (#6176)

c215639

* final update * update changelog

add missing thanks to changelog (#6197)

88d0e96

Skip uploading vsix to azure blob store (#6204)

7259927

publish release

eb8598c

Merge branch 'release-2021.06' of https://github.com/microsoft/vscode…

773f14c

…-jupyter into release-2021.06

publish release

9523213

remove last 2 numbers from release (#6219)

c333a29

publish release

bb2e414

Do not activate Python before opening nb (#6201) (#6230)

3270e6b

publish release

15b41bd

Port LiveKernelModel fix to release for point release (#6264)

f12a2fe

Port keybinding updates to release (#6268)

3f84cf5

* Contribute shift+enter, ctrl+enter, L, shift+L (#6205) * Ctrl+Enter should put cell into command mode after executing (#6231) * Update CHANGELOG and remove news

port test fix (#6275)

9091169

* Fix Restarting kernel... test (#6267) * wait for the restart command * add news file * update changelog

Fix native notebook interrupt toolbar (#6280) (#6282)

cce1a65

David Kutugata and others added 5 commits June 15, 2021 11:33

update changelog (#6284)

6575c34

* -update version -update changelog * leave version as it was

Respect jupyter.enableKeyboardShortcuts setting and enable ctrl+enter…

bd808e8

… in command mode (#6293)

publish release

6d14700

Merge branch 'main' into david/pointReleaseToMain

59e2203

fix gulpfile

ee513c2

DavidKutu marked this pull request as ready for review June 15, 2021 21:36

DavidKutu requested a review from a team as a code owner June 15, 2021 21:36

IanMatthewHuff reviewed Jun 15, 2021

View reviewed changes

IanMatthewHuff approved these changes Jun 16, 2021

View reviewed changes

undo change

6ec0b94

DavidKutu merged commit 3fd9151 into main Jun 16, 2021

DavidKutu deleted the david/pointReleaseToMain branch June 16, 2021 18:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

point release back to main #6301

point release back to main #6301

DavidKutu commented Jun 15, 2021

IanMatthewHuff Jun 15, 2021

DonJayamanne Jun 16, 2021

IanMatthewHuff left a comment

codecov-commenter commented Jun 16, 2021

point release back to main #6301

point release back to main #6301

Conversation

DavidKutu commented Jun 15, 2021

IanMatthewHuff Jun 15, 2021

Choose a reason for hiding this comment

DonJayamanne Jun 16, 2021

Choose a reason for hiding this comment

IanMatthewHuff left a comment

Choose a reason for hiding this comment

codecov-commenter commented Jun 16, 2021

Codecov Report