FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge from release to master by karthiknadig · Pull Request #16002 · microsoft/vscode-python · GitHub

Merge from release to master - #16002

Merged
Karthik Nadig (karthiknadig) merged 8 commits into
microsoft:mainfrom
karthiknadig:mergeback
Apr 20, 2021
Merged

Merge from release to master#16002
Karthik Nadig (karthiknadig) merged 8 commits into
microsoft:mainfrom
karthiknadig:mergeback

Conversation

Copy link
Copy Markdown
Member

No description provided.

Kartik Raj and others added 8 commits April 9, 2021 14:17
…ronment (microsoft#15898)

* Do not run poetry env info -p to get the type for local poetry environment, get best effort type instead

* Update src/test/pythonEnvironments/common/envlayouts/poetry/project4/pyproject.toml

Co-authored-by: Karthik Nadig <kanadig@microsoft.com>

Co-authored-by: Karthik Nadig <kanadig@microsoft.com>
* Use a more forgiving comparer when comparing version

* Update tests

* Move sort interpreters function
* Log parsing errors in verbose mode only

* Fix conda logging

* Wrap yields with try catch

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

What happened with news/1 Enhancements/15641.md → news/1 Enhancements/15924.md?

Copy link
Copy Markdown
Member Author

There were two news items with the same id. I changed this to the PR number because it was an added enhancement.

Karthik Nadig (karthiknadig) merged commit 24b17a9 into microsoft:main Apr 20, 2021
Karthik Nadig (karthiknadig) deleted the mergeback branch May 7, 2021 19:01
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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.

4 participants


Back | FazBrowse Home | New Git URL