Skip to content

Commit

Permalink
Merged PR posit-dev/positron-python#395: Merge upstream: v2024.2.0
Browse files Browse the repository at this point in the history
Merge pull request #395 from posit-dev/merge/v2024.2.0

Merge upstream: `v2024.2.0`
--------------------
Commit message for posit-dev/positron-python@7d85a51:

ignore pyright errors in ms testing files

--------------------
Commit message for posit-dev/positron-python@f9a3259:

Bump flask from 3.0.1 to 3.0.2 (posit-dev/positron-python#354)

Bumps [flask](https://github.com/pallets/flask) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/pallets/flask/releases)
- [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst)
- [Commits](pallets/flask@3.0.1...3.0.2)

---
updated-dependencies:
- dependency-name: flask
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--------------------
Commit message for posit-dev/positron-python@ea812a4:

Bump ipywidgets from 8.1.1 to 8.1.2 (posit-dev/positron-python#368)

Bumps [ipywidgets](https://github.com/jupyter-widgets/ipywidgets) from 8.1.1 to 8.1.2.
- [Release notes](https://github.com/jupyter-widgets/ipywidgets/releases)
- [Commits](jupyter-widgets/ipywidgets@8.1.1...8.1.2)

---
updated-dependencies:
- dependency-name: ipywidgets
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Isabel Zimmerman <[email protected]>
--------------------
Commit message for posit-dev/positron-python@e3a5399:

Bump pyright from 1.1.349 to 1.1.351 (posit-dev/positron-python#379)

Bumps [pyright](https://github.com/RobertCraigie/pyright-python) from 1.1.349 to 1.1.351.
- [Release notes](https://github.com/RobertCraigie/pyright-python/releases)
- [Commits](RobertCraigie/pyright-python@v1.1.349...v1.1.351)

---
updated-dependencies:
- dependency-name: pyright
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--------------------
Commit message for posit-dev/positron-python@2eeb677:

Bump polars from 0.20.6 to 0.20.11 (posit-dev/positron-python#394)

Bumps [polars](https://github.com/pola-rs/polars) from 0.20.6 to 0.20.11.
- [Release notes](https://github.com/pola-rs/polars/releases)
- [Commits](pola-rs/polars@py-0.20.6...py-0.20.11)

---
updated-dependencies:
- dependency-name: polars
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--------------------
Commit message for posit-dev/positron-python@573d9fd:

Bump ipykernel from 6.29.0 to 6.29.3 (posit-dev/positron-python#390)

Bumps [ipykernel](https://github.com/ipython/ipykernel) from 6.29.0 to 6.29.3.
- [Release notes](https://github.com/ipython/ipykernel/releases)
- [Changelog](https://github.com/ipython/ipykernel/blob/main/CHANGELOG.md)
- [Commits](ipython/ipykernel@v6.29.0...v6.29.3)

---
updated-dependencies:
- dependency-name: ipykernel
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--------------------
Commit message for posit-dev/positron-python@334b383:

update package.json

--------------------
Commit message for posit-dev/positron-python@7ce08b1:

Merge tag 'v2024.2.0' into merge/v2024.2.0

--------------------
Commit message for posit-dev/positron-python@063ba15:

Finalized-release-2024.2.0 (posit-dev/positron-python#22996)

Finalized release 2024.2.0: removing -rc
--------------------
Commit message for posit-dev/positron-python@3eef025:

Bump release 2024.2 (posit-dev/positron-python#22972)

Bump release 2024.2
--------------------
Commit message for posit-dev/positron-python@1fbd77b:

 skip tests, pytest upstream regression (posit-dev/positron-python#22974)

Short-term fix to stop CI from failing due to a regression upstream from
pytest. See issue for details:
microsoft/vscode-python#22965.
--------------------
Commit message for microsoft/vscode-python@4fca030:

Adding GDPR tag for isFirstSession (microsoft/vscode-python#22955)


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

Modify telemetry to contain trigger time as property (microsoft/vscode-python#22941)


--------------------
Commit message for microsoft/vscode-python@178a0b2:

Fix bug with symlink for pytest execution (microsoft/vscode-python#22952)

Fixes microsoft/vscode-python#22938
--------------------
Commit message for microsoft/vscode-python@bae7d40:

Update vscode-tas-client version (microsoft/vscode-python#22876)


--------------------
Commit message for microsoft/vscode-python@75ed73e:

Fix Bug with Pytest when using symlinked workspaces (microsoft/vscode-python#22885)

fixes microsoft/vscode-python#22658

also implements switching to arg mapping which is this issue here:
microsoft/vscode-python#22076

---------

Co-authored-by: Karthik Nadig <[email protected]>
--------------------
Commit message for microsoft/vscode-python@e53651d:

Prevent first Python command being lost (microsoft/vscode-python#22902)

Fixes: microsoft/vscode-python#22673
Fixes: microsoft/vscode-python#22545
Fixes: microsoft/vscode-python#22691 

Making best effort to address issue where very first command sent to
REPL via Terminal gets ignored, or gets pasted both in Terminal and in
REPL.

With the fix, we observe whether Python REPL is launched in Terminal via
VS Code's `onDidWriteTerminalData` and send the command, or wait three
seconds as a fallback mechanism.

These two combined together will significantly reduce or resolve
all-together the chance of very first command being swollen up or gets
pasted twice in Terminal and REPL previously where it did not have
context of whether Python REPL instance have started inside the Terminal
or not.
--------------------
Commit message for microsoft/vscode-python@a60fbd5:

Add GDPR tags for new Pylance properties (microsoft/vscode-python#22922)


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

Use python debugger in testing (microsoft/vscode-python#22903)

closed: microsoft/vscode-python-debugger#174
--------------------
Commit message for microsoft/vscode-python@84734a8:

Updating installed extensions section of README.md (microsoft/vscode-python#22893)

Adding the Python Debugger to the installed extensions section of the
README.
--------------------
Commit message for microsoft/vscode-python@2159238:

Bump actions/setup-python from 4 to 5 in /.github/actions/build-vsix (microsoft/vscode-python#22602)

Bumps [actions/setup-python](https://github.com/actions/setup-python)
from 4 to 5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/setup-python/releases">actions/setup-python's
releases</a>.</em></p>
<blockquote>
<h2>v5.0.0</h2>
<h2>What's Changed</h2>
<p>In scope of this release, we update node version runtime from node16
to node20 (<a
href="https://redirect.github.com/actions/setup-python/pull/772">actions/setup-python#772</a>).
Besides, we update dependencies to the latest versions.</p>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/setup-python/compare/v4.8.0...v5.0.0">https://github.com/actions/setup-python/compare/v4.8.0...v5.0.0</a></p>
<h2>v4.8.0</h2>
<h2>What's Changed</h2>
<p>In scope of this release we added support for GraalPy (<a
href="https://redirect.github.com/actions/setup-python/pull/694">actions/setup-python#694</a>).
You can use this snippet to set up GraalPy:</p>
<pre lang="yaml"><code>steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4 
  with:
    python-version: 'graalpy-22.3' 
- run: python my_script.py
</code></pre>
<p>Besides, the release contains such changes as:</p>
<ul>
<li>Trim python version when reading from file by <a
href="https://github.com/FerranPares"><code>@​FerranPares</code></a> in
<a
href="https://redirect.github.com/actions/setup-python/pull/628">actions/setup-python#628</a></li>
<li>Use non-deprecated versions in examples by <a
href="https://github.com/jeffwidman"><code>@​jeffwidman</code></a> in <a
href="https://redirect.github.com/actions/setup-python/pull/724">actions/setup-python#724</a></li>
<li>Change deprecation comment to past tense by <a
href="https://github.com/jeffwidman"><code>@​jeffwidman</code></a> in <a
href="https://redirect.github.com/actions/setup-python/pull/723">actions/setup-python#723</a></li>
<li>Bump <code>@​babel/traverse</code> from 7.9.0 to 7.23.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/setup-python/pull/743">actions/setup-python#743</a></li>
<li>advanced-usage.md: Encourage the use actions/checkout@v4 by <a
href="https://github.com/cclauss"><code>@​cclauss</code></a> in <a
href="https://redirect.github.com/actions/setup-python/pull/729">actions/setup-python#729</a></li>
<li>Examples now use checkout@v4 by <a
href="https://github.com/simonw"><code>@​simonw</code></a> in <a
href="https://redirect.github.com/actions/setup-python/pull/738">actions/setup-python#738</a></li>
<li>Update actions/checkout to v4 by <a
href="https://github.com/dmitry-shibanov"><code>@​dmitry-shibanov</code></a>
in <a
href="https://redirect.github.com/actions/setup-python/pull/761">actions/setup-python#761</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/FerranPares"><code>@​FerranPares</code></a>
made their first contribution in <a
href="https://redirect.github.com/actions/setup-python/pull/628">actions/setup-python#628</a></li>
<li><a href="https://github.com/timfel"><code>@​timfel</code></a> made
their first contribution in <a
href="https://redirect.github.com/actions/setup-python/pull/694">actions/setup-python#694</a></li>
<li><a
href="https://github.com/jeffwidman"><code>@​jeffwidman</code></a> made
their first contribution in <a
href="https://redirect.github.com/actions/setup-python/pull/724">actions/setup-python#724</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/setup-python/compare/v4...v4.8.0">https://github.com/actions/setup-python/compare/v4...v4.8.0</a></p>
<h2>v4.7.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Bump word-wrap from 1.2.3 to 1.2.4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/setup-python/pull/702">actions/setup-python#702</a></li>
<li>Add range validation for toml files by <a
href="https://github.com/dmitry-shibanov"><code>@​dmitry-shibanov</code></a>
in <a
href="https://redirect.github.com/actions/setup-python/pull/726">actions/setup-python#726</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/setup-python/compare/v4...v4.7.1">https://github.com/actions/setup-python/compare/v4...v4.7.1</a></p>
<h2>v4.7.0</h2>
<p>In scope of this release, the support for reading python version from
pyproject.toml was added (<a
href="https://redirect.github.com/actions/setup-python/pull/669">actions/setup-python#669</a>).</p>
<pre lang="yaml"><code>      - name: Setup Python
        uses: actions/setup-python@v4
&lt;/tr&gt;&lt;/table&gt; 
</code></pre>
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/setup-python/commit/0a5c61591373683505ea898e09a3ea4f39ef2b9c"><code>0a5c615</code></a>
Update action to node20 (<a
href="https://redirect.github.com/actions/setup-python/issues/772">#772</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/0ae58361cdfd39e2950bed97a1e26aa20c3d8955"><code>0ae5836</code></a>
Add example of GraalPy to docs (<a
href="https://redirect.github.com/actions/setup-python/issues/773">#773</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/b64ffcaf5b410884ad320a9cfac8866006a109aa"><code>b64ffca</code></a>
update actions/checkout to v4 (<a
href="https://redirect.github.com/actions/setup-python/issues/761">#761</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/8d2896179abf658742de432b3f203d2c2d86a587"><code>8d28961</code></a>
Examples now use checkout@v4 (<a
href="https://redirect.github.com/actions/setup-python/issues/738">#738</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/7bc6abb01e0555719edc2dbca70a2fde309e5e56"><code>7bc6abb</code></a>
advanced-usage.md: Encourage the use actions/checkout@v4 (<a
href="https://redirect.github.com/actions/setup-python/issues/729">#729</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/e8111cec9d3dc15220d8a3b638f08419f57b906a"><code>e8111ce</code></a>
Bump <code>@​babel/traverse</code> from 7.9.0 to 7.23.2 (<a
href="https://redirect.github.com/actions/setup-python/issues/743">#743</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/a00ea43da65e7c04d2bdae58b3afecd77057eb9e"><code>a00ea43</code></a>
add fix for graalpy ci (<a
href="https://redirect.github.com/actions/setup-python/issues/741">#741</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/8635b1ccc5934e73ed3510980fd2e7790b85839b"><code>8635b1c</code></a>
Change deprecation comment to past tense (<a
href="https://redirect.github.com/actions/setup-python/issues/723">#723</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/f6cc428f535856f9c23558d01765a42a4d6cf758"><code>f6cc428</code></a>
Use non-deprecated versions in examples (<a
href="https://redirect.github.com/actions/setup-python/issues/724">#724</a>)</li>
<li><a
href="https://github.com/actions/setup-python/commit/5f2af211d616f86005883b44826180b21abb4060"><code>5f2af21</code></a>
Add GraalPy support (<a
href="https://redirect.github.com/actions/setup-python/issues/694">#694</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/actions/setup-python/compare/v4...v5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-python&package-manager=github_actions&previous-version=4&new-version=5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--------------------
Commit message for microsoft/vscode-python@83cf53b:

Add "isMeasurement" for LANGUAGE_SERVER_TRIGGER_DURATION (microsoft/vscode-python#22912)

cc/ @cwebster-99
--------------------
Commit message for microsoft/vscode-python@7be33eb:

Add more shell integration sequences to check for (microsoft/vscode-python#22911)

Based on discussion with Daniel

For microsoft/vscode-python#22440
--------------------
Commit message for microsoft/vscode-python@6838ccf:

Do not activate microvenv if terminal.activateEnvironment is set to false and when not in terminal experiment (microsoft/vscode-python#22909)


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

Log options being passed when using environment collection APIs (microsoft/vscode-python#22907)

For microsoft/vscode-python#22899
--------------------
Commit message for microsoft/vscode-python@5f971ae:

Prepend `PATH` both at shell integration and process creation (microsoft/vscode-python#22905)


--------------------
Commit message for microsoft/vscode-python@5174d5c:

Improve shell integration reliability for zsh (microsoft/vscode-python#22891)

Closes microsoft/vscode-python#22881

If status changes, re-run activation. Also persist once we know shell
integration works for a shell.
--------------------
Commit message for microsoft/vscode-python@b0c34e3:

Add UnicodeDecodeError catching (microsoft/vscode-python#22873)

Resolve `UnicodeDecodeError: 'utf-8' codec can't decode byte 0xd0 in
position 48995: unexpected end of data`

Co-authored-by: Aydar Kamaltdinov <[email protected]>
--------------------
Commit message for microsoft/vscode-python@8496dfe:

Remove experimental flag for create env prompt (microsoft/vscode-python#22892)

Remove experimental flag for `python.createEnvironment.trigger`.
--------------------
Commit message for microsoft/vscode-python@c4c05a6:

update tree comparison for tests to be order independent for children (microsoft/vscode-python#22832)

following the introduction of pytest 8, the order in which children were
listed changed. Since the order is not important, this updates the tests
to make the tests not consider order of children when comparing actual
and expected outcomes of test runs.
--------------------
Commit message for microsoft/vscode-python@4030717:

Use terminal data write event to figure out whether shell integration is working (microsoft/vscode-python#22872)

Closes microsoft/vscode-python#22439

Blocked on microsoft/vscode#204616
--------------------
Commit message for microsoft/vscode-python@d674a17:

Fix Run Recent Command Caching Issue (microsoft/vscode-python#22867)

Resolves: microsoft/vscode-python#22811

Fixing caching issue where users were experiencing cached
success/failure decoration that were impacted when using `Terminal: Run
Recent Command` on success/failure commands
--------------------
Commit message for microsoft/vscode-python@c0bf1b7:

Improve time taken to trigger language server startup once extension activation is triggered (microsoft/vscode-python#22514)

For microsoft/vscode-python#22146 

Improves time taken to trigger language server startup once extension
activation is triggered

- Do not block discovery on windows registry
- Do not blocking auto-selection on validation of all interpreters
- Make Windows Path locator faster
--------------------
Commit message for microsoft/vscode-python@20c1a10:

Log when running Python file (microsoft/vscode-python#22851)

For microsoft/vscode-python#22711
--------------------
Commit message for microsoft/vscode-python@8aaa70e:

Fix venv activation for cshell (microsoft/vscode-python#22852)

Closes microsoft/vscode-python#22822

Use current shell to figure out whether shell integration is working,
even when using fallback shell for getting environment variables.
--------------------
Commit message for microsoft/vscode-python@1626c46:

Do not run commands to check whether shell integration is working (microsoft/vscode-python#22850)

Closes microsoft/vscode-python#22774 closes
microsoft/vscode-python#22743
--------------------
Commit message for microsoft/vscode-python@13a6727:

include multiple pytest versions in PR check (microsoft/vscode-python#22813)

update PR check workflow to include testing Python tests against 3
versions of pytest: pre-release, stable release, and oldest supported
version.

---------

Co-authored-by: Karthik Nadig <[email protected]>
--------------------
Commit message for microsoft/vscode-python@6e8c56c:

Bump dev version 2024.1 (microsoft/vscode-python#22805)



Lead-authored-by: Kartik Raj <[email protected]>
Co-authored-by: Aydar Kamaltdinov <[email protected]>
Co-authored-by: paulacamargo25 <[email protected]>
Co-authored-by: Luciana Abud <[email protected]>
Co-authored-by: Courtney Webster <[email protected]>
Co-authored-by: Anthony Kim <[email protected]>
Co-authored-by: Isabel Zimmerman <[email protected]>
Co-authored-by: Eleanor Boyd <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: GitHub <[email protected]>
  • Loading branch information
9 people authored and wesm committed Mar 28, 2024
1 parent a64b0e1 commit c976f74
Show file tree
Hide file tree
Showing 70 changed files with 1,453 additions and 337 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:

# Jedi LS depends on dataclasses which is not in the stdlib in Python 3.7.
- name: Use Python 3.8 for JediLSP
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
cache: 'pip'
Expand Down
15 changes: 14 additions & 1 deletion extensions/positron-python/.github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ jobs:
# macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
os: [ubuntu-latest, windows-latest]
# Run the tests on the oldest and most recent versions of Python.
python: ['3.8', '3.x', '3.12-dev']
python: ['3.8', '3.x'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release
pytest-version: ['pytest', 'pytest@pre-release', 'pytest==6.2.0']

steps:
- name: Checkout
Expand All @@ -104,6 +105,18 @@ jobs:
with:
python-version: ${{ matrix.python }}

- name: Install specific pytest version
if: matrix.pytest-version == 'pytest@pre-release'
run: |
python -m pip install --pre pytest
- name: Install specific pytest version
if: matrix.pytest-version != 'pytest@pre-release'
run: |
python -m pip install "${{ matrix.pytest-version }}"
- name: Install specific pytest version
run: python -m pytest --version
- name: Install base Python requirements
uses: brettcannon/pip-secure-install@v1
with:
Expand Down
29 changes: 29 additions & 0 deletions extensions/positron-python/ThirdPartyNotices-Repository.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Microsoft Python extension for Visual Studio Code incorporates third party mater
11. vscode-cpptools (https://github.com/microsoft/vscode-cpptools)
12. mocha (https://github.com/mochajs/mocha)
13. get-pip (https://github.com/pypa/get-pip)
14. vscode-js-debug (https://github.com/microsoft/vscode-js-debug)

%%
Go for Visual Studio Code NOTICES, INFORMATION, AND LICENSE BEGIN HERE
Expand Down Expand Up @@ -1032,3 +1033,31 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

=========================================
END OF get-pip NOTICES, INFORMATION, AND LICENSE


%% vscode-js-debug NOTICES, INFORMATION, AND LICENSE BEGIN HERE
=========================================

MIT License

Copyright (c) Microsoft Corporation. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
=========================================
END OF vscode-js-debug NOTICES, INFORMATION, AND LICENSE
4 changes: 2 additions & 2 deletions extensions/positron-python/build/license-header.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PLEASE NOTE: This is the license for the Python extension for Visual Studio Code. The Python extension automatically installs other extensions as optional dependencies, which can be uninstalled at any time. These extensions have separate licenses:

- The Jupyter extension is released under an MIT License:
https://marketplace.visualstudio.com/items/ms-toolsai.jupyter/license
- The Python Debugger extension is released under an MIT License:
https://marketplace.visualstudio.com/items/ms-python.debugpy/license

- The Pylance extension is only available in binary form and is released under a Microsoft proprietary license, the terms of which are available here:
https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/license
Expand Down
10 changes: 5 additions & 5 deletions extensions/positron-python/build/pinned-test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ prospector==0.12.2
# avoid breaking changes in pytest 8 https://github.com/microsoft/vscode-python/issues/22798
pytest==7.4.4
# --- End Positron ---
Flask==3.0.1
Flask==3.0.2
fastapi==0.109.2
uvicorn==0.27.0.post1
Django==5.0.1; python_version >= '3.10'
Expand All @@ -25,8 +25,8 @@ torch-tb-profiler==0.4.3
freezegun==1.4.0
# iPython Kernel tests
fastcore==1.5.29
ipykernel==6.29.0
ipywidgets==8.1.1
ipykernel==6.29.3
ipywidgets==8.1.2
matplotlib==3.8.2; python_version >= '3.9'
matplotlib==3.7.4; python_version < '3.9'
# Require fonttools >= 4.43.0 to avoid CVE-2023-45139
Expand All @@ -37,10 +37,10 @@ pandas==2.2.0; python_version >= '3.9'
pandas==2.0.3; python_version < '3.9'
# Require pillow >= 10.0.1 to avoid CVE-2023-4863
pillow==10.2.0
pyright==1.1.349
pyright==1.1.351
pytest-asyncio==0.23.4
pytest-mock==3.12.0
polars==0.20.6
polars==0.20.11
torch==2.1.2; python_version < '3.12'
# Require wheel >= 0.38.0 to avoid CVE-2022-40898
wheel==0.38.0
5 changes: 1 addition & 4 deletions extensions/positron-python/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,6 @@
"enum": [
"off",
"prompt"
],
"tags": [
"experimental"
]
},
"python.condaPath": {
Expand Down Expand Up @@ -1646,7 +1643,7 @@
"vscode-jsonrpc": "^8.2.0",
"vscode-languageclient": "^9.0.1",
"vscode-languageserver-protocol": "^3.17.5",
"vscode-tas-client": "^0.1.75",
"vscode-tas-client": "^0.1.84",
"which": "^2.0.2",
"winreg": "^1.2.4",
"xml2js": "^0.5.0"
Expand Down
2 changes: 1 addition & 1 deletion extensions/positron-python/pythonFiles/install_debugpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
DEBUGGER_DEST = os.path.join(EXTENSION_ROOT, "pythonFiles", "lib", "python")
DEBUGGER_PACKAGE = "debugpy"
DEBUGGER_PYTHON_ABI_VERSIONS = ("cp310",)
DEBUGGER_VERSION = "1.8.0" # can also be "latest"
DEBUGGER_VERSION = "1.8.1" # can also be "latest"


def _contains(s, parts=()):
Expand Down
3 changes: 2 additions & 1 deletion extensions/positron-python/pythonFiles/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ ignore = [
'tests/testing_tools/adapter/test_util.py',
'tests/testing_tools/adapter/pytest/test_cli.py',
'tests/testing_tools/adapter/pytest/test_discovery.py',
'tests/unittestadapter/.data/unittest_skip/unittest_skip_function.py'
'tests/unittestadapter/.data/unittest_skip/unittest_skip_function.py',
'tests/pytestadapter/helpers.py'
]

[tool.ruff]
Expand Down
2 changes: 1 addition & 1 deletion extensions/positron-python/pythonFiles/pythonrc.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def __str__(self):
exit_code = 1
else:
exit_code = 0

self.hooks.failure_flag = False
# Guide following official VS Code doc for shell integration sequence:
result = ""
# For non-windows allow recent_command history.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
# └── test_top_folder.py
# └── test_top_function_t
# └── test_top_function_f
# └── z_nested_folder_one
# └── nested_folder_one
# └── test_bottom_folder.py
# └── test_bottom_function_t
# └── test_bottom_function_f
Expand All @@ -326,14 +326,14 @@
TEST_DATA_PATH / "dual_level_nested_folder" / "test_top_folder.py"
)

test_z_nested_folder_one_path = (
TEST_DATA_PATH / "dual_level_nested_folder" / "z_nested_folder_one"
test_nested_folder_one_path = (
TEST_DATA_PATH / "dual_level_nested_folder" / "nested_folder_one"
)

test_bottom_folder_path = (
TEST_DATA_PATH
/ "dual_level_nested_folder"
/ "z_nested_folder_one"
/ "nested_folder_one"
/ "test_bottom_folder.py"
)

Expand Down Expand Up @@ -392,10 +392,10 @@
],
},
{
"name": "z_nested_folder_one",
"path": os.fspath(test_z_nested_folder_one_path),
"name": "nested_folder_one",
"path": os.fspath(test_nested_folder_one_path),
"type_": "folder",
"id_": os.fspath(test_z_nested_folder_one_path),
"id_": os.fspath(test_nested_folder_one_path),
"children": [
{
"name": "test_bottom_folder.py",
Expand All @@ -412,11 +412,11 @@
),
"type_": "test",
"id_": get_absolute_test_id(
"dual_level_nested_folder/z_nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
"dual_level_nested_folder/nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
test_bottom_folder_path,
),
"runID": get_absolute_test_id(
"dual_level_nested_folder/z_nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
"dual_level_nested_folder/nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
test_bottom_folder_path,
),
},
Expand All @@ -429,11 +429,11 @@
),
"type_": "test",
"id_": get_absolute_test_id(
"dual_level_nested_folder/z_nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
"dual_level_nested_folder/nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
test_bottom_folder_path,
),
"runID": get_absolute_test_id(
"dual_level_nested_folder/z_nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
"dual_level_nested_folder/nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
test_bottom_folder_path,
),
},
Expand Down Expand Up @@ -994,3 +994,78 @@
],
"id_": str(TEST_DATA_PATH),
}
SYMLINK_FOLDER_PATH = TEST_DATA_PATH / "symlink_folder"
SYMLINK_FOLDER_PATH_TESTS = TEST_DATA_PATH / "symlink_folder" / "tests"
SYMLINK_FOLDER_PATH_TESTS_TEST_A = (
TEST_DATA_PATH / "symlink_folder" / "tests" / "test_a.py"
)
SYMLINK_FOLDER_PATH_TESTS_TEST_B = (
TEST_DATA_PATH / "symlink_folder" / "tests" / "test_b.py"
)

symlink_expected_discovery_output = {
"name": "symlink_folder",
"path": str(SYMLINK_FOLDER_PATH),
"type_": "folder",
"children": [
{
"name": "tests",
"path": str(SYMLINK_FOLDER_PATH_TESTS),
"type_": "folder",
"id_": str(SYMLINK_FOLDER_PATH_TESTS),
"children": [
{
"name": "test_a.py",
"path": str(SYMLINK_FOLDER_PATH_TESTS_TEST_A),
"type_": "file",
"id_": str(SYMLINK_FOLDER_PATH_TESTS_TEST_A),
"children": [
{
"name": "test_a_function",
"path": str(SYMLINK_FOLDER_PATH_TESTS_TEST_A),
"lineno": find_test_line_number(
"test_a_function",
os.path.join(tests_path, "test_a.py"),
),
"type_": "test",
"id_": get_absolute_test_id(
"tests/test_a.py::test_a_function",
SYMLINK_FOLDER_PATH_TESTS_TEST_A,
),
"runID": get_absolute_test_id(
"tests/test_a.py::test_a_function",
SYMLINK_FOLDER_PATH_TESTS_TEST_A,
),
}
],
},
{
"name": "test_b.py",
"path": str(SYMLINK_FOLDER_PATH_TESTS_TEST_B),
"type_": "file",
"id_": str(SYMLINK_FOLDER_PATH_TESTS_TEST_B),
"children": [
{
"name": "test_b_function",
"path": str(SYMLINK_FOLDER_PATH_TESTS_TEST_B),
"lineno": find_test_line_number(
"test_b_function",
os.path.join(tests_path, "test_b.py"),
),
"type_": "test",
"id_": get_absolute_test_id(
"tests/test_b.py::test_b_function",
SYMLINK_FOLDER_PATH_TESTS_TEST_B,
),
"runID": get_absolute_test_id(
"tests/test_b.py::test_b_function",
SYMLINK_FOLDER_PATH_TESTS_TEST_B,
),
}
],
},
],
}
],
"id_": str(SYMLINK_FOLDER_PATH),
}
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
# └── test_top_folder.py
# └── test_top_function_t: success
# └── test_top_function_f: failure
# └── z_nested_folder_one
# └── nested_folder_one
# └── test_bottom_folder.py
# └── test_bottom_function_t: success
# └── test_bottom_function_f: failure
Expand All @@ -318,7 +318,7 @@
dual_level_nested_folder_bottom_path = (
TEST_DATA_PATH
/ "dual_level_nested_folder"
/ "z_nested_folder_one"
/ "nested_folder_one"
/ "test_bottom_folder.py"
)
dual_level_nested_folder_execution_expected_output = {
Expand All @@ -345,11 +345,11 @@
"subtest": None,
},
get_absolute_test_id(
"z_nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
"nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
dual_level_nested_folder_bottom_path,
): {
"test": get_absolute_test_id(
"z_nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
"nested_folder_one/test_bottom_folder.py::test_bottom_function_t",
dual_level_nested_folder_bottom_path,
),
"outcome": "success",
Expand All @@ -358,11 +358,11 @@
"subtest": None,
},
get_absolute_test_id(
"z_nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
"nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
dual_level_nested_folder_bottom_path,
): {
"test": get_absolute_test_id(
"z_nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
"nested_folder_one/test_bottom_folder.py::test_bottom_function_f",
dual_level_nested_folder_bottom_path,
),
"outcome": "failure",
Expand Down Expand Up @@ -479,7 +479,7 @@
dual_level_nested_folder_bottom_path = (
TEST_DATA_PATH
/ "dual_level_nested_folder"
/ "z_nested_folder_one"
/ "nested_folder_one"
/ "test_bottom_folder.py"
)
unittest_folder_add_path = TEST_DATA_PATH / "unittest_folder" / "test_add.py"
Expand Down Expand Up @@ -684,3 +684,15 @@
"subtest": None,
},
}

# Constant for the symlink execution test where TEST_DATA_PATH / "root" the target and TEST_DATA_PATH / "symlink_folder" the symlink
test_a_symlink_path = TEST_DATA_PATH / "symlink_folder" / "tests" / "test_a.py"
symlink_run_expected_execution_output = {
get_absolute_test_id("test_a.py::test_a_function", test_a_symlink_path): {
"test": get_absolute_test_id("test_a.py::test_a_function", test_a_symlink_path),
"outcome": "success",
"message": None,
"traceback": None,
"subtest": None,
}
}
Loading

0 comments on commit c976f74

Please sign in to comment.