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 release back into master #13574

Merged
merged 9 commits into from Aug 24, 2020
Merged

Conversation

karthiknadig
Copy link
Member

@IanMatthewHuff looks like file 13177.md was not deleted when the change log was generated for the 2020.8.0 release. Was that that intentional. The bug itself is not closed, so it can create duplicate entries, if we have more fixes going to that bug. Also, 11711.md from June release will run into a similar case. Since there is a new 11711.md for that issue in master, since it was not entirely fixed in the June release (see changelog entry for this). I think it is OK to have multiple fixes go in for the same issue, I am just checking since it looked odd.

David Kutugata and others added 9 commits August 6, 2020 14:34
…ft#13296)

* Add gather status bar and update survey link (microsoft#13225)

* add status bar

* add localization

* Added news file

* add a 2 second timeout

* updated the gather survey link

* Change the gather icon while gathering

* moved the gathering redux function to
interactive common
added a constant

* move css to common.css

* removed the status bar message

* changed noop import

* update changelog
Co-authored-by: Rich Chiodo <rchiodo@users.noreply.github.com>
…dings for most new interactive window cell commands (microsoft#13334) (microsoft#13348)

* Add Goto Prev/Next Cell

* Add goto previous cell

* Remove unneeded changes

* Add default keybindings for cell commands

* Goto should be Go to

Co-authored-by: Jim Griesmer <jimg@live.com>

Co-authored-by: Jim Griesmer <jimg@live.com>
)

Code change can only affect new keyboard shortcut operations
* update version number and npm install to update package-lock.json

* update changelog version and date

* update news for changelog.md

* update generated TPN

Co-authored-by: Ian Huff <ianhuff@ravikun-dev2.redmond.corp.microsoft.com>
* Update LSP to latest to resolve problems with LS settings  (microsoft#13511)

* Fix path

* Actually fix settings

* Add news

* Add test

* Format

* Suppress 'jediEnabled' removal

* Drop survey first launch threshold

* Update LSP to fix issue with settings in MPLS v1

* Add telemetry for `switch to Pylance` acceptance (microsoft#13526)

* Fix path

* Actually fix settings

* Add news

* Add test

* Format

* Suppress 'jediEnabled' removal

* Drop survey first launch threshold

* Initial

* Add test

* PR feedback

* Rename property

* Rename constant

* Define property

* Moar rename

* casing

* Update version and changelogs

* Show status of Jupyter server (Connected/Disconnected) when the user hovers over the status icon (microsoft#13544)

* Update change log with more cherry picks

Co-authored-by: Mikhail Arkhipov <mikhaila@microsoft.com>
Co-authored-by: Shantnu Suman <shsuman@microsoft.com>
@karthiknadig karthiknadig added the no-changelog No news entry required label Aug 23, 2020
@sonarcloud
Copy link

sonarcloud bot commented Aug 23, 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-commenter
Copy link

codecov-commenter commented Aug 23, 2020

Codecov Report

Merging #13574 into master will decrease coverage by 0.01%.
The diff coverage is 51.72%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13574      +/-   ##
==========================================
- Coverage   59.73%   59.71%   -0.02%     
==========================================
  Files         670      670              
  Lines       37434    37337      -97     
  Branches     5373     5302      -71     
==========================================
- Hits        22362    22297      -65     
+ Misses      13908    13906       -2     
+ Partials     1164     1134      -30     
Impacted Files Coverage Δ
src/client/datascience/types.ts 100.00% <ø> (ø)
src/client/telemetry/index.ts 82.35% <ø> (ø)
src/datascience-ui/interactive-common/mainState.ts 57.14% <ø> (ø)
src/client/datascience/commands/commandRegistry.ts 34.50% <28.57%> (ø)
...ient/datascience/editor-integration/codewatcher.ts 68.03% <37.83%> (ø)
src/client/common/utils/localize.ts 96.21% <100.00%> (ø)
src/client/datascience/constants.ts 99.78% <100.00%> (-0.01%) ⬇️
...ience/interactive-common/interactiveWindowTypes.ts 100.00% <100.00%> (ø)
...nt/languageServices/proposeLanguageServerBanner.ts 94.23% <100.00%> (ø)
src/client/telemetry/constants.ts 100.00% <100.00%> (ø)
... and 85 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 c3af16d...99adb0b. Read the comment docs.

@IanMatthewHuff
Copy link
Member

@karthiknadig Hmmm, no wasn't intentional. I'm looking back at the history now. Looks like 13177.md and 13252.md were merged after snap into release branch. But while both were added to news only 13252.md was the file deleted. Not sure on why yet. But I didn't do anything manual in the merge back to master from release.

@IanMatthewHuff
Copy link
Member

Ahh, I see it now. David did a port for his fix to release and updated the changelog manually in the port, but didn't delete the file:
https://github.com/microsoft/vscode-python/pull/13296/files

Since it was already in the changelog my manual update of the changelog didn't delete the file here:
https://github.com/microsoft/vscode-python/pull/13401/files

NBD, I'll just have to watch out a bit closer when I'm doing the release to make sure that ports either update the changelog and delete the file, or just keep the file in and don't update the changelog.

@karthiknadig karthiknadig merged commit 06e8b89 into microsoft:master Aug 24, 2020
@karthiknadig karthiknadig deleted the mergeback branch August 31, 2020 20:47
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.

None yet

5 participants