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

Apply positron-python updates from vscode-python v2024.4.0 #2678

Merged
merged 48 commits into from
Apr 8, 2024

Conversation

wesm
Copy link
Contributor

@wesm wesm commented Apr 5, 2024

Some notes:

  • pythonFiles renamed to python_files (need to make corresponding updates for Positron)
  • Formatting changed to ruff from black
  • Changes to environmentTypeComparer.ts that interact with Positron customizations, needs to be inspected

The net deletion is coming from src/test/pythonFiles/formatting being deleted upstream. It seems like this was intentional but haven't found the discussion yet about it. (it is indeed gone in main https://github.com/microsoft/vscode-python/tree/main/src/test/python_files)

@wesm wesm changed the title In-progress upstream updates to vscode-python v2024.4.0 Apply positron-python updates from vscode-python v2024.4.0 Apr 5, 2024
@wesm wesm requested review from petetronic and isabelizimm April 5, 2024 15:59
@wesm
Copy link
Contributor Author

wesm commented Apr 5, 2024

@isabelizimm @petetronic this is ready for tire-kicking -- I built locally and nothing seemed obviously broken. I mentioned there were some pyenv related changes and so we may need to take a closer look at that in environmentTypeComparers.ts as follow up work.

Regarding the actual merge: I'm not big on merge commits in general, and since we aren't technically "merging" anything here but rather applying a sequence of patches -- we replayed the upstream history onto this repository -- a rebase-and-push would be superior in my view but I will defer to the wishes of others.

I'm just going to roll up the fixes I made into a single commit now that the CI has passed.

@wesm wesm force-pushed the vscode-python-v2024.4.0 branch from 4b9a7b9 to 3d5a751 Compare April 5, 2024 16:04
Copy link
Contributor

@isabelizimm isabelizimm left a comment

Choose a reason for hiding this comment

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

took it for a quick spin, and all seems to be normal so far-- tried out plots pane, variables pane, debugger, lsp (finding references, hover, etc), data explorer. I can take a deeper look at the changes you mentioned on Monday!

Kartik Raj and others added 24 commits April 8, 2024 11:35
Short-term fix to stop CI from failing due to a regression upstream from
pytest. See issue for details:
microsoft/vscode-python#22965.
Part of microsoft/vscode-jupyter#14977

Removes some effectively dead code that would only be used by very old
(year+) versions of Pylance. This logic has all been moved into
vscode-pylance:

- Middleware to make the interactive window input box look like a
notebook cell
- Call to Jupyter to get pythonpath for notebooks.
- Configuration hook to get `[python]` value of `editor.formatOnType`.
- LSP notebook experiment
Closes microsoft/vscode-python#22994 closes
microsoft/vscode-python#22993

Temporarily build our own known cache from which we return envs instead.
add calendar for primary and secondary release champ
- Adding the Python Debugger extension to the `devcontainer.json`
extensions.
- Small hygiene updates and removing mention of built linting and
formatting support on `README.md`.

---------

Co-authored-by: Luciana Abud <[email protected]>
paulacamargo25 and others added 24 commits April 8, 2024 11:35
Use new report issue command api
microsoft/vscode-python-debugger#237
Modify the template, information about the installed extensions was
added
Forgot to set default value to true here:
microsoft/vscode-python#23067
It was true before removing experiment code since we had experiment to
100%, which effectively overrode the smart send setting value to True.
Fixes microsoft/vscode-python#22810

TODO

- [x] check if it actually works already or if more things need to be
registered
- [x] add config val
- [x] add tests
…ython#23080)

Closes microsoft/vscode-python#22956

Because we calculate `PS1` ourselves due to a limitation:
microsoft/vscode-python#22078, this environment
variable may not end up being respected as do not use `PS1`. This PR
fixes it.
…rom locator (microsoft/vscode-python#23083)

For microsoft/vscode-python#22810

...so in case of Hatch, as an [explicit Hatch identifier is not
available](microsoft/vscode-python#22779 (comment)),
we infer an environment is Hatch if we get it from the Hatch locator:
microsoft/vscode-python#22779.
…icrosoft/vscode-python#23102)

For microsoft/vscode-python#19153

Filter out any pipenv or poetry envs which do not belong to the current
workspace.
- Updating walkthrough based on previous experiment
- Updating based on
microsoft/vscode-python#22664

Co-authored-by: Eleanor Boyd <[email protected]>
Create env button should be `false` by default and the notification
prompt should be enabled by default
…osoft/vscode-python#23099)

- This has already been discussed and resolved for tests discovery in
this [PR](microsoft/vscode-python#22454)
- I have now run into the same issue for executing the test suite and
have applied the same fix in this PR
- Tested and working

[Issue](microsoft/vscode-python#23098) for
this current PR

[Original
Issue](microsoft/vscode-python#22453)
[Original PR](microsoft/vscode-python#22454)

Co-authored-by: Eleanor Boyd <[email protected]>
…-python#23160)

remove these edits from the release so instead it will start in insiders
then be released as a point release
other changes needed for the rename. Removed unintentional not in
pytestadapter/test_discovery.py which seems to have been left there by
accident.
@wesm wesm force-pushed the vscode-python-v2024.4.0 branch from 3d5a751 to dd08d81 Compare April 8, 2024 16:36
@wesm
Copy link
Contributor Author

wesm commented Apr 8, 2024

After talking with Pete, there are two strategies we can use to avoid pushing many commits to main:

  • Create a merge commit from this branch
  • Produce a squashed commit with all the changes since the last release like the last upstream merge created during the repository grafting c976f74. I'd have to use the Python git tools to create the same kind of comprehensive commit message

I'll just do the merge strategy for now so that we can keep things moving forward, but if we want to do the squash strategy next time, let me know and I will make sure that the tools are organized and documented

@wesm wesm merged commit cd43189 into main Apr 8, 2024
23 checks passed
@wesm wesm deleted the vscode-python-v2024.4.0 branch April 8, 2024 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.