Skip to content
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.

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

Merge point release back to main #14293

Merged
merged 25 commits into from
Oct 7, 2020
Merged

Merge point release back to main #14293

merged 25 commits into from
Oct 7, 2020

Conversation

DavidKutu
Copy link

@DavidKutu DavidKutu commented Oct 6, 2020

  • 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).
  • The wiki is updated with any design decisions/details.

IanMatthewHuff and others added 21 commits September 17, 2020 13:43
* Fix installing ipykernel into interpreters for raw kernel (#13959)

* update news

Co-authored-by: Ian Huff <ianhuff@CEIDCCEVIPSVC01.redmond.corp.microsoft.com>
* Up release version for new release (#13928)

* Up release version

* Update changelog

* Update changelog

* Workaround test issue (#13930)

* Try different version of VS code in release

* Change to make it use the actual variable

* Use a real version

* More tests failing with gpu error (#13935)

* Try different version of VS code in release

* Change to make it use the actual variable

* Use a real version

* Two more version changes

* Fix kernel and server name missing in certain situations (#13974)

* Fix kernel name and server name

* Fixup server name for remote situations

* Add some functional tests

* Add news entry

* Delete news file
* Disable split views of custom editors (#13985)

* Fix backup storage by looking at the options correctly (#13983)

* Fix backup storage by looking at the options correctly

* Fix backup by being more explicit

* Only linux tests are failing. Hopefully fix them

* Fixup changelog

Co-authored-by: Don Jayamanne <don.jayamanne@yahoo.com>
* add jedi-language-server to 3rd party notices

* move license from distribution to repository file
* Do not quote isolated in exec module (#14108)

* Do not quote isolated in exec module

* Revert "Do not quote isolated in exec module"

This reverts commit b9fa04c.

* Revert "IPyKernel install issue with windows paths (#13667)"

This reverts commit 23725ab.

* Fix unit test broken by recent revert (#14122)
* Fix HTML escaping to match what Jupyter does (#14038)

* Basic idea

* add some functional tests

* Add news entry

* Fix functional tests

* Update changelog
* Fixes for escaping

* Push a comment ot start PR again

* Cache task is failing

* Remove cache task

* Not fixing so just put back cache task
* A different way of fixing escaping (#14186)

* Move escaping to just output

* Add some tests to verify round tripping

* Fixup test for rountrip and make roundtripping actually work

* Add news entry

* Add to manual test file

* Fix streaming problem and add more to the test

* Fix traceback unit test

* Fix problem caught by functional tests :)

* Another functional test catch

* Update changelog
* Fix two problems with escaping (#14228)

* Fixup changelog
* Remove unneeded cell keys when exporting (#14241)

* Remove transient output when exporting from the interactive window

* Add news entry

* Update changelog
@@ -0,0 +1,47 @@
{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file shouldn't be there.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As in, it should be somewhere else, or deleted?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry as in deleted. It was submitted by mistake

Copy link
Member

@karthiknadig karthiknadig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you merge back, the md files which were used to generate the change log should also be deleted.
14169.md,14182.md, and 14210.md

@karthiknadig
Copy link
Member

Actually there are few more. All of these should be deleted from main.
news/1 Enhancements/14027.md
news/2 Fixes/11151.md
news/2 Fixes/13956.md
news/2 Fixes/13981.md
news/2 Fixes/5678.md

@sonarcloud
Copy link

sonarcloud bot commented Oct 7, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@codecov-io
Copy link

codecov-io commented Oct 7, 2020

Codecov Report

❗ No coverage uploaded for pull request base (main@abf9a5e). Click here to learn what that means.
The diff coverage is 37.09%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #14293   +/-   ##
=======================================
  Coverage        ?   59.84%           
=======================================
  Files           ?      692           
  Lines           ?    38380           
  Branches        ?     5524           
=======================================
  Hits            ?    22968           
  Misses          ?    14222           
  Partials        ?     1190           
Impacted Files Coverage Δ
...rc/client/common/process/internal/scripts/index.ts 70.12% <ø> (ø)
src/client/datascience/export/exportUtil.ts 13.55% <0.00%> (ø)
...ient/datascience/interactive-ipynb/nativeEditor.ts 7.78% <ø> (ø)
src/client/datascience/jupyter/jupyterImporter.ts 15.66% <0.00%> (ø)
...science/jupyter/liveshare/guestJupyterExecution.ts 17.30% <0.00%> (ø)
src/client/datascience/types.ts 100.00% <ø> (ø)
src/datascience-ui/interactive-common/mainState.ts 57.14% <ø> (ø)
src/client/datascience/jupyter/jupyterNotebook.ts 4.21% <7.14%> (ø)
...atascience/notebookStorage/nativeEditorProvider.ts 17.26% <7.69%> (ø)
.../datascience/interactive-common/interactiveBase.ts 5.77% <9.09%> (ø)
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update abf9a5e...7f1a48b. Read the comment docs.

@rchiodo rchiodo merged commit 4659f46 into main Oct 7, 2020
@rchiodo rchiodo deleted the david/releaseToMain branch October 7, 2020 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog No news entry required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants