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.

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

Jump to bottom

new inactive discovery logic #20566

Merged
merged 24 commits into from
Jan 31, 2023
Merged

new inactive discovery logic #20566

merged 24 commits into from
Jan 31, 2023

Conversation

eleanorjboyd
Copy link
Member

@eleanorjboyd eleanorjboyd commented Jan 25, 2023 •
edited
Loading

This commit combines the edits made in #20210 and #20175. It also includes which code to uncomment in order to make the new way of test discovery work. This commit takes into account all edits suggested on the previous PRs and since the state of those PRs was close to approval should not be too large of a PR when combined. This new discovery logic will stay inactive until the whole re-write is complete.

@eleanorjboyd eleanorjboyd added no-changelog No news entry required skip tests Updates to tests unnecessary labels Jan 25, 2023
@eleanorjboyd eleanorjboyd changed the title Edits on python logic new inactive discovery logic Jan 25, 2023
@eleanorjboyd eleanorjboyd marked this pull request as ready for review January 25, 2023 22:55
@vscodenpa vscodenpa added this to the February 2023 milestone Jan 25, 2023
karthiknadig
karthiknadig previously approved these changes Jan 27, 2023
View reviewed changes
@eleanorjboyd eleanorjboyd merged commit 3fe7057 into microsoft:main Jan 31, 2023
@eleanorjboyd eleanorjboyd deleted the edits-on-python-logic branch January 31, 2023 22:46
This was referenced Jan 31, 2023
Closed
Closed
@eleanorjboyd eleanorjboyd mentioned this pull request Feb 17, 2023
Closed
wesm pushed a commit to posit-dev/positron that referenced this pull request Mar 28, 2024
@karthiknadig @eleanorjboyd @petetronic
Merge remote-tracking branch 'upstream/main'
50a5d67 
Merging upstream vscode-python from 2023-02-03 commit fe4c5f1e4ae069160514495a717ff46f4cd11a61

--------------------
Commit message for microsoft/vscode-python@fe4c5f1:

Add a button in prompt to check logs in case the selected interpreter is invalid (microsoft/vscode-python#20642)


--------------------
Commit message for microsoft/vscode-python@1538833:

Allow to select a Python2.7 interpreter (microsoft/vscode-python#20639)


--------------------
Commit message for microsoft/vscode-python@9271136:

Move `replaceAll` and `splitLines` out of string extensions. (microsoft/vscode-python#20626)

For microsoft/vscode-python#18871
--------------------
Commit message for microsoft/vscode-python@e743037:

Ensure editable install only when [build-system] is present `pyproject.toml` (microsoft/vscode-python#20625)

Fixes microsoft/vscode-python#20620
--------------------
Commit message for microsoft/vscode-python@b43bc25:

Do not recommend Python2 as an interpreter (microsoft/vscode-python#20628)


--------------------
Commit message for microsoft/vscode-python@ddc765e:

Fix wording in conda inherit env prompt (microsoft/vscode-python#20627)

Closes microsoft/vscode-python#19001
--------------------
Commit message for microsoft/vscode-python@401418a:

Ensure IDs of Conda environments without python does not change after python is installed (microsoft/vscode-python#20609)

Fixes microsoft/vscode-python#20176

As we're changing IDs we've to ensure the same environment in cache with
older ID is migrated to use the new one, this is already ensured here:
https://github.com/microsoft/vscode-python/blob/32f55109c976e66bf39e8da6aae0c9b6f5115df2/src/client/pythonEnvironments/base/locators/composite/envsCollectionCache.ts#L109
--------------------
Commit message for microsoft/vscode-python@92d2d85:

Fix test failures due to linting (microsoft/vscode-python#20617)

Fixes microsoft/vscode-python#20612
--------------------
Commit message for microsoft/vscode-python@d245a90:

Update to latest `jedi-language-server` (microsoft/vscode-python#20611)

Fixes microsoft/vscode-python#20606
--------------------
Commit message for microsoft/vscode-python@3fe7057:

new inactive discovery logic (microsoft/vscode-python#20566)

New pytest code in a currently inactive state. 
--------------------
Commit message for microsoft/vscode-python@bf4091e:

Skip windows store interpreters found via windows registry when discovering (microsoft/vscode-python#20613)

Closes microsoft/vscode-python#20603
--------------------
Commit message for microsoft/vscode-python@ec2af99:

Use `markdownDescription` for settings with markdown in description (microsoft/vscode-python#20600)

Fixes microsoft/vscode-python#20582
--------------------
Commit message for microsoft/vscode-python@7ca872e:

Add option to skip showing recommended interpreter in quick pick API (microsoft/vscode-python#20604)

Closes microsoft/vscode-python#20260
--------------------
Commit message for microsoft/vscode-python@184617e:

Check to ensure major version matches current year. (microsoft/vscode-python#20601)

Fixes microsoft/vscode-python#20466
--------------------
Commit message for microsoft/vscode-python@328e511:

Ensure dependency quick pick is not shown when user exits env creation. (microsoft/vscode-python#20605)

Fixes microsoft/vscode-python#20602
--------------------
Commit message for microsoft/vscode-python@7fb72b7:

Update main to next pre-release (microsoft/vscode-python#20598)


--------------------
Commit message for microsoft/vscode-python@2dd9287:

Set release candidate version. (microsoft/vscode-python#20597)


--------------------
Commit message for microsoft/vscode-python@b83aacb:

Update `debugpy` to v1.6.6 (microsoft/vscode-python#20596)


--------------------
Commit message for microsoft/vscode-python@93b0053:

Skip requirement files from `site-packages` or `__pypackages__` (microsoft/vscode-python#20573)

Fixes microsoft/vscode-python#20560

Lead-authored-by: Karthik Nadig <kanadig@microsoft.com>
Co-authored-by: Eleanor Boyd <eleanorboyd@microsoft.com>
Co-authored-by: Pete Farland <pete.farland@posit.co>
Co-authored-by: Kartik Raj <karraj@microsoft.com>
wesm pushed a commit to posit-dev/positron that referenced this pull request Mar 28, 2024
@karthiknadig @eleanorjboyd
@petetronic @wesm
Merge remote-tracking branch 'upstream/main'
06c5dad 
Merging upstream vscode-python from 2023-02-03 commit fe4c5f1e4ae069160514495a717ff46f4cd11a61

--------------------
Commit message for microsoft/vscode-python@fe4c5f1:

Add a button in prompt to check logs in case the selected interpreter is invalid (microsoft/vscode-python#20642)


--------------------
Commit message for microsoft/vscode-python@1538833:

Allow to select a Python2.7 interpreter (microsoft/vscode-python#20639)


--------------------
Commit message for microsoft/vscode-python@9271136:

Move `replaceAll` and `splitLines` out of string extensions. (microsoft/vscode-python#20626)

For microsoft/vscode-python#18871
--------------------
Commit message for microsoft/vscode-python@e743037:

Ensure editable install only when [build-system] is present `pyproject.toml` (microsoft/vscode-python#20625)

Fixes microsoft/vscode-python#20620
--------------------
Commit message for microsoft/vscode-python@b43bc25:

Do not recommend Python2 as an interpreter (microsoft/vscode-python#20628)


--------------------
Commit message for microsoft/vscode-python@ddc765e:

Fix wording in conda inherit env prompt (microsoft/vscode-python#20627)

Closes microsoft/vscode-python#19001
--------------------
Commit message for microsoft/vscode-python@401418a:

Ensure IDs of Conda environments without python does not change after python is installed (microsoft/vscode-python#20609)

Fixes microsoft/vscode-python#20176

As we're changing IDs we've to ensure the same environment in cache with
older ID is migrated to use the new one, this is already ensured here:
https://github.com/microsoft/vscode-python/blob/32f55109c976e66bf39e8da6aae0c9b6f5115df2/src/client/pythonEnvironments/base/locators/composite/envsCollectionCache.ts#L109
--------------------
Commit message for microsoft/vscode-python@92d2d85:

Fix test failures due to linting (microsoft/vscode-python#20617)

Fixes microsoft/vscode-python#20612
--------------------
Commit message for microsoft/vscode-python@d245a90:

Update to latest `jedi-language-server` (microsoft/vscode-python#20611)

Fixes microsoft/vscode-python#20606
--------------------
Commit message for microsoft/vscode-python@3fe7057:

new inactive discovery logic (microsoft/vscode-python#20566)

New pytest code in a currently inactive state. 
--------------------
Commit message for microsoft/vscode-python@bf4091e:

Skip windows store interpreters found via windows registry when discovering (microsoft/vscode-python#20613)

Closes microsoft/vscode-python#20603
--------------------
Commit message for microsoft/vscode-python@ec2af99:

Use `markdownDescription` for settings with markdown in description (microsoft/vscode-python#20600)

Fixes microsoft/vscode-python#20582
--------------------
Commit message for microsoft/vscode-python@7ca872e:

Add option to skip showing recommended interpreter in quick pick API (microsoft/vscode-python#20604)

Closes microsoft/vscode-python#20260
--------------------
Commit message for microsoft/vscode-python@184617e:

Check to ensure major version matches current year. (microsoft/vscode-python#20601)

Fixes microsoft/vscode-python#20466
--------------------
Commit message for microsoft/vscode-python@328e511:

Ensure dependency quick pick is not shown when user exits env creation. (microsoft/vscode-python#20605)

Fixes microsoft/vscode-python#20602
--------------------
Commit message for microsoft/vscode-python@7fb72b7:

Update main to next pre-release (microsoft/vscode-python#20598)


--------------------
Commit message for microsoft/vscode-python@2dd9287:

Set release candidate version. (microsoft/vscode-python#20597)


--------------------
Commit message for microsoft/vscode-python@b83aacb:

Update `debugpy` to v1.6.6 (microsoft/vscode-python#20596)


--------------------
Commit message for microsoft/vscode-python@93b0053:

Skip requirement files from `site-packages` or `__pypackages__` (microsoft/vscode-python#20573)

Fixes microsoft/vscode-python#20560

Lead-authored-by: Karthik Nadig <kanadig@microsoft.com>
Co-authored-by: Eleanor Boyd <eleanorboyd@microsoft.com>
Co-authored-by: Pete Farland <pete.farland@posit.co>
Co-authored-by: Kartik Raj <karraj@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karthiknadig karthiknadig karthiknadig approved these changes

Assignees

@eleanorjboyd eleanorjboyd

Labels
no-changelog No news entry required skip tests Updates to tests unnecessary
Projects
None yet
Milestone
February 2023
Development

Successfully merging this pull request may close these issues.
3 participants
@eleanorjboyd @karthiknadig @vscodenpa