Skip to content

Commit a5d0583

Browse files
Kartik RajTyriarluabuddependabot[bot]cwebster-99
authored andcommitted
Merged PR posit-dev/positron-python#213: Merge python extension release 2023.16.0
Merge pull request #213 from posit-dev/merge/2023.16.0 Merge python extension release 2023.16.0 -------------------- Commit message for posit-dev/positron-python@cca4be0: Fix pyright issues -------------------- Commit message for posit-dev/positron-python@c3bd360: Merge branch 'main' into merge/2023.16.0 -------------------- Commit message for posit-dev/positron-python@bebadea: EnvironmentVariableScope now provided by vscode 1.82 -------------------- Commit message for posit-dev/positron-python@3e9d86b: Add back installation capability for ipykernel -------------------- Commit message for posit-dev/positron-python@6a7d49a: Merge commit '8c612511b99cb5ebc78153684de8fe595bd154dc' -------------------- Commit message for microsoft/vscode-python@8c61251: Update version for release candidate (microsoft/vscode-python#21919) -------------------- Commit message for microsoft/vscode-python@d9b9c88: Always prepend to PATH instead of replacing it (microsoft/vscode-python#21906) For microsoft/vscode-python#20822 microsoft/vscode-python#11039 Replacing as-is has its problems, for eg. pyenv asks their users to manipulate `PATH` in their init script: https://github.com/pyenv/pyenv#set-up-your-shell-environment-for-pyenv, which we could end up replacing. ![image](https://github.com/microsoft/vscode-python/assets/13199757/cc904f76-8d42-47e1-a6c8-6cfff6543db8) Particularly for pyenv, it mean users not being able to find pyenv: ![image](https://github.com/microsoft/vscode-python/assets/13199757/26100328-c227-435b-a4f2-ec168099f4c1) Prepending solves it for cases where initial PATH value is suffix of the final value: ![image](https://github.com/microsoft/vscode-python/assets/13199757/a95e4ffd-68dc-4e73-905e-504b3051324f) But, in other cases, this means that we end up with the whole `PATH` thrice. This is because it prepends it twice: - Once in shell integration script - Once when creating a process So the final value could be: ``` PATH=<activated_full_path><activated_full_path><original_path> ``` where `<activated_full_path>` refers to value of `PATH` environment variable post activation. eg. ![image](https://github.com/microsoft/vscode-python/assets/13199757/7e771f62-eb53-49be-b261-d259096008f3) -------------------- Commit message for microsoft/vscode-python@7a9294c: Apply feedback for terminal activation prompt (microsoft/vscode-python#21905) For microsoft/vscode-python#21793 ![image](https://github.com/microsoft/vscode-python/assets/13199757/b3ab6002-0a07-4b3b-8101-a84865ea12e4) -------------------- Commit message for microsoft/vscode-python@44f5bf7: Set PS1 for conda environments in non-Windows when in `pythonTerminalEnvVarActivation` experiment (microsoft/vscode-python#21902) For microsoft/vscode-python#20822 ![image](https://github.com/microsoft/vscode-python/assets/13199757/8c9d4c87-54f2-4661-b6c6-c3b49ee3ff7a) -------------------- Commit message for microsoft/vscode-python@7d25ceb: Remove finalized api proposals from package.json (microsoft/vscode-python#21900) Part of microsoft/vscode#191605 -------------------- Commit message for microsoft/vscode-python@31aa246: Also show env name for prefixed conda envs in terminal prompt (microsoft/vscode-python#21899) -------------------- Commit message for microsoft/vscode-python@941fcfa: Fixes from TPIs (microsoft/vscode-python#21896) Closes microsoft/vscode-python#21884 Closes microsoft/vscode-python#21889 -------------------- Commit message for microsoft/vscode-python@f255e02: Call out that env name may not show in terminal activation notification (microsoft/vscode-python#21897) Closes microsoft/vscode-python#21887 -------------------- Commit message for microsoft/vscode-python@782d5b1: Also show interpreter in status bar when a Python related output channel is opened (microsoft/vscode-python#21894) Closes microsoft/vscode-python#21890 -------------------- Commit message for microsoft/vscode-python@1204011: Activate environment when not using integrated terminal for debugging (microsoft/vscode-python#21880) For microsoft/vscode-python#4300 -------------------- Commit message for microsoft/vscode-python@98428cd: Apply custom env variables to terminal when in `pythonTerminalEnvVarActivation` experiment (microsoft/vscode-python#21879) For microsoft/vscode-python#944 microsoft/vscode-python#20822 We only apply those env vars to terminal which are not in process env variables, hence remove custom env vars from process variables. -------------------- Commit message for microsoft/vscode-python@3fa5d4b: Support for Create Env command to re-create env for venv (microsoft/vscode-python#21829) Closes microsoft/vscode-python#21827 -------------------- Commit message for microsoft/vscode-python@30e26c2: Update proposed API for env collection (microsoft/vscode-python#21819) For microsoft/vscode-python#20822 Blocked on microsoft/vscode#171173 (comment) -------------------- Commit message for microsoft/vscode-python@15bb974: Do not filter using scheme when filtering environments (microsoft/vscode-python#21862) For microsoft/vscode-python#21825 On codespaces, it was leading to workspace environments not being displayed, which could mess up auto-selection. -------------------- Commit message for microsoft/vscode-python@cfbf1f3: remove usage of pytest CollectReport in rewrite (microsoft/vscode-python#21859) as per https://docs.pytest.org/en/7.1.x/reference/reference.html#collectreport, `CollectReport` is experimental and therefore it should not be in our extension. Fixes microsoft/vscode-python#21784 -------------------- Commit message for microsoft/vscode-python@0749b20: Show `Python: Clear Workspace interpreter` command regardless of whether a Python file is opened (microsoft/vscode-python#21858) Closes microsoft/vscode-python#21850 -------------------- Commit message for microsoft/vscode-python@021b362: Update VS Code engine (microsoft/vscode-python#21847) For microsoft/vscode-python#21831 -------------------- Commit message for microsoft/vscode-python@8407e9d: Wrap env collection workspace proposed APIs in `try...catch` block (microsoft/vscode-python#21846) Closes microsoft/vscode-python#21831 -------------------- Commit message for microsoft/vscode-python@c979455: Set workspaceFolder in debug config before substituting command variables (microsoft/vscode-python#21835) For microsoft/vscode-python#18482 -------------------- Commit message for microsoft/vscode-python@96ba735: fix data to string from buffer for output channel (microsoft/vscode-python#21821) fix microsoft/vscode-python#21820 -------------------- Commit message for microsoft/vscode-python@5140a8d: Apply API recommendations for Create Env API (microsoft/vscode-python#21804) Closes microsoft/vscode-python#21090 -------------------- Commit message for microsoft/vscode-python@0248fa8: fixing failing tests on CI (microsoft/vscode-python#21814) fixing microsoft/vscode-python#21813 -------------------- Commit message for microsoft/vscode-python@9c740b9: Show notification reaffirming Python extension still handles activation when in `pythonTerminalEnvVarActivation` experiment (microsoft/vscode-python#21802) Closes microsoft/vscode-python#21793 Only show notification when terminal prompt does not already indicate that env is activated. -------------------- Commit message for microsoft/vscode-python@b447bf1: Feature branch testing overflow bug fix (microsoft/vscode-python#21812) This merges in two PRs that were reverted because of a bug introduced that caused subprocess overflow. reverted PRs: microsoft/vscode-python#21667, microsoft/vscode-python#21682 This now implements these two PRs allowing for absolute testIds and an execObservable for the subprocess. This PR also adds a bug fix and functional tests to ensure this doesn't happen again. Since this PR is large, all items in it have already been reviewed as they were merged into the feature branch. -------------------- Commit message for microsoft/vscode-python@bd749aa: Fix `service.test.ts` to stop disposing of all services (microsoft/vscode-python#21811) file `service.test.ts` was calling to dispose of all items related to the service container for clean up. This led to services in later tests failing since they were close already. Fixes here allow for new tests in the test adapter to be written. fix helps microsoft/vscode-python#21803 -------------------- Commit message for microsoft/vscode-python@385bb37: Add `language_server.jinja_usage` to `pylance.ts` (microsoft/vscode-python#21809) -------------------- Commit message for microsoft/vscode-python@71d6dab: Add one more property to load event (microsoft/vscode-python#21800) This PR adds app name to the editor_load telemetry event -------------------- Commit message for microsoft/vscode-python@ab8d3b2: Update VS Code engine (microsoft/vscode-python#21799) For microsoft/vscode-python#11039 -------------------- Commit message for microsoft/vscode-python@835eab5: Add setting to control severity of missing package diagnostic. (microsoft/vscode-python#21794) Closes microsoft/vscode-python#21792 -------------------- Commit message for microsoft/vscode-python@fbbf987: Use updated API to fetch scoped env collection (microsoft/vscode-python#21788) For microsoft/vscode#171173 microsoft/vscode-python#20822 To be merged tomorrow when latest insiders is released. Blocked on microsoft/vscode#189979. -------------------- Commit message for microsoft/vscode-python@0a2c285: Bump brettcannon/check-for-changed-files from 1.1.1 to 1.2.0 (microsoft/vscode-python#21772) Bumps [brettcannon/check-for-changed-files](https://github.com/brettcannon/check-for-changed-files) from 1.1.1 to 1.2.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/brettcannon/check-for-changed-files/releases">brettcannon/check-for-changed-files's releases</a>.</em></p> <blockquote> <h2>v1.2.0</h2> <h2>What's Changed</h2> <ul> <li>Add support for github tokens for private repos. by <a href="https://github.com/Marenz"><code>@​Marenz</code></a> in <a href="https://redirect.github.com/brettcannon/check-for-changed-files/pull/83">brettcannon/check-for-changed-files#83</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Marenz"><code>@​Marenz</code></a> made their first contribution in <a href="https://redirect.github.com/brettcannon/check-for-changed-files/pull/83">brettcannon/check-for-changed-files#83</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/brettcannon/check-for-changed-files/compare/v1...v1.2.0">https://github.com/brettcannon/check-for-changed-files/compare/v1...v1.2.0</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/brettcannon/check-for-changed-files/commit/4170644959a21843b31f1181f2a1761d65ef4791"><code>4170644</code></a> Add support for github tokens for private repos. (<a href="https://redirect.github.com/brettcannon/check-for-changed-files/issues/83">#83</a>)</li> <li><a href="https://github.com/brettcannon/check-for-changed-files/commit/294a99714e0d350b5083472a293d41bc91804e68"><code>294a997</code></a> Bump word-wrap from 1.2.3 to 1.2.4 (<a href="https://redirect.github.com/brettcannon/check-for-changed-files/issues/82">#82</a>)</li> <li>See full diff in <a href="https://github.com/brettcannon/check-for-changed-files/compare/v1.1.1...v1.2.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=brettcannon/check-for-changed-files&package-manager=github_actions&previous-version=1.1.1&new-version=1.2.0)](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 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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -------------------- Commit message for microsoft/vscode-python@9ac14b8: Update README.md for npm package (microsoft/vscode-python#21766) Fix indent for https://www.npmjs.com/package/@vscode/python-extension?activeTab=readme -------------------- Commit message for microsoft/vscode-python@3fed49f: Add Ruff to CI (microsoft/vscode-python#21739) Add Ruff to (lint > action.yml) CI #21738 -------------------- Commit message for microsoft/vscode-python@c490339: Update version of npm package (microsoft/vscode-python#21765) -------------------- Commit message for microsoft/vscode-python@8e0e59b: Remove optionalDependencies from API npm package and document to install vscode types separately (microsoft/vscode-python#21764) Closes It still leads to conflicts due to double installation of vscode types when testing through the cases, removing vscode types as dependencies altogether and documenting to install it separately instead. -------------------- Commit message for microsoft/vscode-python@cabdf39: Use `optionalDependencies` instead of `peerDependencies` for `@vscode/python-extension` npm package (microsoft/vscode-python#21763) Closes microsoft/vscode-python#21720 -------------------- Commit message for microsoft/vscode-python@dd20561: revert due to buffer overflow on subprocess (microsoft/vscode-python#21762) revert microsoft/vscode-python#21667 because it causes buffer overflow in the python testing subprocess when larger repos are used. Specifically seen on pytest discovery with >200 tests. Revert to align with the stable release and put in a fix next week. -------------------- Commit message for microsoft/vscode-python@40ff6e9: Remove private Jupyter APIs from public API types (microsoft/vscode-python#21761) For microsoft/vscode-jupyter#13986 -------------------- Commit message for microsoft/vscode-python@23353bb: Improvements to `pythonTerminalEnvVarActivation` experiment (microsoft/vscode-python#21751) -------------------- Commit message for microsoft/vscode-python@40bb62a: fix spelling for get-pip.py (microsoft/vscode-python#21752) fix spelling from get_pip to get-pip as advised. -------------------- Commit message for microsoft/vscode-python@f454515: Update release plan to document what to do with `main` during endgame week (microsoft/vscode-python#21743) -------------------- Commit message for microsoft/vscode-python@dff25d4: revert absolute test-ids (microsoft/vscode-python#21742) seeing a substantial error where test discovery is broken. Reverting this commit seems to be the temporary fix until I can diagnose the real problem. commit it is reverting: microsoft/vscode-python#21682 -------------------- Commit message for microsoft/vscode-python@ca4dfd4: update tests only on save with more files excluded (microsoft/vscode-python#21741) fixes microsoft/vscode-python#21014 and microsoft/vscode-python#21061 -------------------- Commit message for microsoft/vscode-python@84bbff9: add cwd for debugging (microsoft/vscode-python#21668) fixes microsoft/vscode-python#21648 (comment) -------------------- Commit message for microsoft/vscode-python@ef16727: Clean up smoke test requirement (microsoft/vscode-python#21729) Cleaning up smoke test dependency: See if all Github action test pass with removing the smoke test requirement file content. Checked one by one, and came to see removing all doesn't seem to have impact on the outcome of running smoke test.(Seems to have no difference in smoke test result outcome when ran with "Run and Debug" in VS Code with smoke-test option selected). Also got rid of below, after checking smoke test correctly passing after removal of smoke-test-requirement.txt content: ![Screenshot 2023-08-01 at 2 57 45 PM](https://github.com/microsoft/vscode-python/assets/62267334/45d404de-74dd-45a5-885b-71a25ef16ad7) Resolve: microsoft/vscode-python#21496 -------------------- Commit message for microsoft/vscode-python@358635d: Remove old and unused API for Jupyter Ext (microsoft/vscode-python#21731) We have not used any of this API for a while now, hence its safe to remove these. Will be removing more soon. -------------------- Commit message for microsoft/vscode-python@8f3d60b: unittest discovery errors not displaying in test explorer (microsoft/vscode-python#21726) saw an issue where if discovery failed there was no notice in the test explorer for unittest. It was due to a different value for the new blank value for the payload tests. fixes microsoft/vscode-python#21725 and microsoft/vscode-python#21688 -------------------- Commit message for microsoft/vscode-python@a6a8cb1: Update main to next pre-release (microsoft/vscode-python#21728) -------------------- Commit message for microsoft/vscode-python@4ab510d: Update version for release candidate (microsoft/vscode-python#21727) -------------------- Commit message for microsoft/vscode-python@3e7118f: Update packages for Jedi and core python (microsoft/vscode-python#21710) -------------------- Commit message for microsoft/vscode-python@237f82b: Fix UUID and disposing to resolve race condition (microsoft/vscode-python#21667) fixes microsoft/vscode-python#21599 and microsoft/vscode-python#21507 -------------------- Commit message for microsoft/vscode-python@d9e368f: add area-repl to issue label (microsoft/vscode-python#21718) added area-repl as one of the issue label. -------------------- Commit message for microsoft/vscode-python@ceecdb0: Removing Jupyter Notebooks mentions from package.json (microsoft/vscode-python#21708) -------------------- Commit message for microsoft/vscode-python@11a9f1d: Remove unwanted Jupyter API (microsoft/vscode-python#21702) Fixes microsoft/vscode-jupyter#13986 -------------------- Commit message for microsoft/vscode-python@efcc3d7: Make test_ids relative to workspace path not root dir (microsoft/vscode-python#21682) makes sure all testIds that are returned to the extension are relative to the workspace (which will be the invocation directory) instead of to the root. This will stop testIds for not being recognized when using a config file or another parameter that changes the root directory during pytest. fixes microsoft/vscode-python#21640 and microsoft/vscode-python#21637 -------------------- Commit message for microsoft/vscode-python@06d62aa: Update homepage for Python API package (microsoft/vscode-python#21703) For microsoft/vscode-python#21631 -------------------- Commit message for microsoft/vscode-python@83107cc: Move "vscode" out of required dependencies for npm package (microsoft/vscode-python#21701) Closes microsoft/vscode-python#21684 -------------------- Commit message for microsoft/vscode-python@d673004: Convert JS-style typings to native TS in `@vscode/python-extension` (microsoft/vscode-python#21692) Closes microsoft/vscode-python#21690 -------------------- Commit message for microsoft/vscode-python@8b9bca1: Do not show "Select at workspace level" option if only one workspace folder is opened (microsoft/vscode-python#21689) Closes microsoft/vscode-python#21220 -------------------- Commit message for microsoft/vscode-python@f536b74: Edit issue-labels.yml, triage-info-needed.yml (microsoft/vscode-python#21685) Add Anthony to issue-labels.yml and triage-info-needed.yml -------------------- Commit message for microsoft/vscode-python@a42cb33: Add new telemetry property to GPDR (microsoft/vscode-python#21683) This property was added for tracking diagnostics we emit in Pylance. -------------------- Commit message for microsoft/vscode-python@6af959d: Dev Container Using MCR (microsoft/vscode-python#21675) Dev container rewrite using MCR. Pyenv for installing and managing python versions. Fish also installed as optional (able to view as shell option in codespaces). Also fixing conda error. Takes care of: microsoft/vscode-python#21591 rewrite from: microsoft/vscode-python#21435 to adhere to company policy. -------------------- Commit message for microsoft/vscode-python@73a0e9d: handle skip unittest at file without error (microsoft/vscode-python#21678) fixes microsoft/vscode-python#21653 -------------------- Commit message for microsoft/vscode-python@9bcb82d: Ensure `Run Python in dedicated terminal` uses `python.executeInFirDir` setting (microsoft/vscode-python#21681) -------------------- Commit message for microsoft/vscode-python@713007f: correct discovery on unittest skip at file level (microsoft/vscode-python#21665) given a file called skip_test_file_node.py that has `raise SkipTest(".....")` this should appear in the sidebar with no children. The bug is that currently it shows a "unittest" node that gives "loader" and other incorrect nodes below it. -------------------- Commit message for microsoft/vscode-python@be334bd: Do not resolve symbolic links in posix locator if they exceed the count limit (microsoft/vscode-python#21658) Closes microsoft/vscode-python#21310 Fixes interpreter discovery running forever for non-Windows OS -------------------- Commit message for microsoft/vscode-python@c256678: Prevent posix paths locator from crashing (microsoft/vscode-python#21657) For microsoft/vscode-python#21310 -------------------- Commit message for microsoft/vscode-python@81ae205: Bring back feature to Run Python file in dedicated terminal (microsoft/vscode-python#21656) Closes microsoft/vscode-python#21282 Closes microsoft/vscode-python#21420 Closes microsoft/vscode-python#21215 Reverts microsoft/vscode-python#21418 -------------------- Commit message for microsoft/vscode-python@c144200: Modify .eslintrc to turn off any errors for declaration files (microsoft/vscode-python#21652) For microsoft/vscode-python#21631 -------------------- Commit message for microsoft/vscode-python@f7125da: Use correct `tsconfig.json` when generating npm package (microsoft/vscode-python#21651) For microsoft/vscode-python#21631 - Unset `removeComment` as that leads to declarations without docstrings - Set to generate declarations - Use updated typescript which results in cleaner declaration files -------------------- Commit message for microsoft/vscode-python@2e8dc67: Add extra logging regarding interpreter discovery (microsoft/vscode-python#21639) For microsoft/vscode-python#21310 -------------------- Commit message for microsoft/vscode-python@fc1c391: Compare global storage data using only `key` (microsoft/vscode-python#21636) Closes microsoft/vscode-python#21635 by applying the same fix as done in microsoft/vscode-python#17627. Lead-authored-by: Kartik Raj <karraj@microsoft.com> Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Co-authored-by: Luciana Abud <45497113+luabud@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Courtney Webster <60238438+cwebster-99@users.noreply.github.com> Co-authored-by: Brett Cannon <brcan@microsoft.com> Co-authored-by: Erik De Bonte <erikd@microsoft.com> Co-authored-by: Rich Chiodo <rchiodo@users.noreply.github.com> Co-authored-by: Don Jayamanne <don.jayamanne@outlook.com> Co-authored-by: Anthony Kim <62267334+anthonykim1@users.noreply.github.com> Co-authored-by: Pete Farland <pete.farland@posit.co> Co-authored-by: Karthik Nadig <kanadig@microsoft.com> Co-authored-by: Eleanor Boyd <eleanorboyd@microsoft.com> Signed-off-by: GitHub <noreply@github.com>
1 parent 3fcf1d6 commit a5d0583

File tree

147 files changed

+4821
-1465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+4821
-1465
lines changed
Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
# This image will serve as a starting point for devcontainer.json.
2-
# Get latest image of Fedora as the base image.
3-
FROM docker.io/library/fedora:latest
1+
FROM mcr.microsoft.com/devcontainers/typescript-node:16-bookworm
42

5-
# Install supported python versions and nodejs.
6-
RUN dnf -y --nodocs install /usr/bin/{python3.7,python3.8,python3.9,python3.10,python3.11,git,conda,clang} && \
7-
dnf clean all
3+
RUN apt-get install -y wget bzip2
84

9-
ENV NVM_VERSION=0.39.3
10-
ENV NODE_VERSION=16.17.1
11-
ENV NPM_VERSION=8.19.3
12-
13-
# Installation instructions from https://github.com/nvm-sh/nvm .
14-
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash
15-
RUN export NVM_DIR="$HOME/.nvm" && \
16-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
17-
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
18-
nvm install $NODE_VERSION && \
19-
npm install -g npm@$NPM_VERSION
20-
21-
# For clean open source builds.
22-
ENV DISABLE_TRANSLATIONS=true
5+
# Run in silent mode and save downloaded script as anaconda.sh.
6+
# Run with /bin/bash and run in silent mode to /opt/conda.
7+
# Also get rid of installation script after finishing.
8+
RUN wget --quiet https://repo.anaconda.com/archive/Anaconda3-2023.07-1-Linux-x86_64.sh -O ~/anaconda.sh && \
9+
/bin/bash ~/anaconda.sh -b -p /opt/conda && \
10+
rm ~/anaconda.sh
2311

12+
ENV PATH="/opt/conda/bin:$PATH"
2413

14+
# Sudo apt update needs to run in order for installation of fish to work .
15+
RUN sudo apt update && \
16+
sudo apt install fish -y
2517

2618

extensions/positron-python/.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
},
2222
// Commands to execute on container creation,start.
2323
"postCreateCommand": "bash scripts/postCreateCommand.sh",
24-
// Environment variable placed inside containerEnv following: https://containers.dev/implementors/json_reference/#general-properties
24+
"onCreateCommand": "bash scripts/onCreateCommand.sh",
25+
2526
"containerEnv": {
2627
"CI_PYTHON_PATH": "/workspaces/vscode-python/.venv/bin/python"
2728
}

extensions/positron-python/.github/actions/lint/action.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,10 @@ runs:
4747
python -m black . --check
4848
working-directory: pythonFiles
4949
shell: bash
50+
51+
- name: Run Ruff
52+
run: |
53+
python -m pip install -U ruff
54+
python -m ruff check .
55+
working-directory: pythonFiles
56+
shell: bash

extensions/positron-python/.github/actions/smoke-tests/action.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ runs:
2626
cache-dependency-path: |
2727
build/test-requirements.txt
2828
requirements.txt
29-
build/smoke-test-requirements.txt
3029
3130
- name: Install dependencies (npm ci)
3231
run: npm ci --prefer-offline
@@ -43,11 +42,6 @@ runs:
4342
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy
4443
shell: bash
4544

46-
- name: pip install smoke test requirements
47-
run: |
48-
python -m pip install --upgrade -r build/smoke-test-requirements.txt
49-
shell: bash
50-
5145
# Bits from the VSIX are reused by smokeTest.ts to speed things up.
5246
- name: Download VSIX
5347
uses: actions/download-artifact@v2

extensions/positron-python/.github/release_plan.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
All dates should align with VS Code's [iteration](https://github.com/microsoft/vscode/labels/iteration-plan) and [endgame](https://github.com/microsoft/vscode/labels/endgame-plan) plans.
22

3-
Feature freeze is Monday @ 17:00 America/Vancouver, XXX XX.
3+
Feature freeze is Monday @ 17:00 America/Vancouver, XXX XX. At that point, commits to `main` should only be in response to bugs found during endgame testing until the release candidate is ready.
44

55

66
NOTE: the number of this release is in the issue title and can be substituted in wherever you see [YYYY.minor].
@@ -51,6 +51,7 @@ NOTE: this PR should make all CI relating to `main` be passing again (such as th
5151
- [ ] Manually add/fix any 3rd-party licenses as appropriate based on what the internal build pipeline detects.
5252
- [ ] Open appropriate [documentation issues](https://github.com/microsoft/vscode-docs/issues?q=is%3Aissue+is%3Aopen+label%3Apython).
5353
- [ ] Contact the PM team to begin drafting a blog post.
54+
- [ ] Announce to the development team that `main` is open again.
5455

5556

5657
# Release (Wednesday, XXX XX)

extensions/positron-python/.github/workflows/issue-labels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66

77
env:
88
# To update the list of labels, see `getLabels.js`.
9-
REPO_LABELS: '["area-api","area-data science","area-debugging","area-diagnostics","area-editor-*","area-environments","area-formatting","area-intellisense","area-internal","area-linting","area-terminal","area-testing","author-verification-requested","bug","community ask","debt","dependencies","documentation","experimenting","feature-request","good first issue","help wanted","important","info-needed","invalid-testplan-item","investigating","iteration-candidate","iteration-plan","iteration-plan-draft","javascript","linux","macos","meta","needs community feedback","needs PR","needs proposal","needs spike","no-changelog","on-testplan","partner ask","regression","release-plan","reports-wanted","skip package*.json","skip tests","tensorboard","testplan-item","triage-needed","verification-found","verification-needed","verification-steps-needed","verified","windows"]'
10-
TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd"]'
9+
REPO_LABELS: '["area-api","area-data science","area-debugging","area-diagnostics","area-editor-*","area-environments","area-formatting","area-intellisense","area-internal","area-linting","area-repl","area-terminal","area-testing","author-verification-requested","bug","community ask","debt","dependencies","documentation","experimenting","feature-request","good first issue","help wanted","important","info-needed","invalid-testplan-item","investigating","iteration-candidate","iteration-plan","iteration-plan-draft","javascript","linux","macos","meta","needs community feedback","needs PR","needs proposal","needs spike","no-changelog","on-testplan","partner ask","regression","release-plan","reports-wanted","skip package*.json","skip tests","tensorboard","testplan-item","triage-needed","verification-found","verification-needed","verification-steps-needed","verified","windows"]'
10+
TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd","anthonykim1"]'
1111

1212
permissions:
1313
issues: write

extensions/positron-python/.github/workflows/pr-file-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: 'package-lock.json matches package.json'
20-
uses: brettcannon/check-for-changed-files@v1.1.1
20+
uses: brettcannon/check-for-changed-files@v1.2.0
2121
with:
2222
prereq-pattern: 'package.json'
2323
file-pattern: 'package-lock.json'
2424
skip-label: 'skip package*.json'
2525
failure-message: '${prereq-pattern} was edited but ${file-pattern} was not (the ${skip-label} label can be used to pass this check)'
2626

2727
- name: 'package.json matches package-lock.json'
28-
uses: brettcannon/check-for-changed-files@v1.1.1
28+
uses: brettcannon/check-for-changed-files@v1.2.0
2929
with:
3030
prereq-pattern: 'package-lock.json'
3131
file-pattern: 'package.json'
3232
skip-label: 'skip package*.json'
3333
failure-message: '${prereq-pattern} was edited but ${file-pattern} was not (the ${skip-label} label can be used to pass this check)'
3434

3535
- name: 'Tests'
36-
uses: brettcannon/check-for-changed-files@v1.1.1
36+
uses: brettcannon/check-for-changed-files@v1.2.0
3737
with:
3838
prereq-pattern: src/**/*.ts
3939
file-pattern: |

extensions/positron-python/.github/workflows/triage-info-needed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [created]
66

77
env:
8-
TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd", "brettcannon"]'
8+
TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd", "brettcannon","anthonykim1"]'
99

1010
jobs:
1111
add_label:

extensions/positron-python/build/smoke-test-requirements.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

extensions/positron-python/package.json

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
"envShellEvent",
2424
"testObserver",
2525
"quickPickItemTooltip",
26-
"envCollectionWorkspace",
27-
"saveEditor",
28-
"envCollectionOptions"
26+
"saveEditor"
2927
],
3028
"author": {
3129
"name": "Microsoft Corporation"
@@ -46,7 +44,7 @@
4644
"theme": "dark"
4745
},
4846
"engines": {
49-
"vscode": "^1.79.0-20230526"
47+
"vscode": "^1.82.0-20230830"
5048
},
5149
"enableTelemetry": false,
5250
"keywords": [
@@ -62,8 +60,7 @@
6260
"Formatters",
6361
"Other",
6462
"Data Science",
65-
"Machine Learning",
66-
"Notebooks"
63+
"Machine Learning"
6764
],
6865
"activationEvents": [
6966
"onStartupFinished",
@@ -1150,6 +1147,21 @@
11501147
"scope": "machine",
11511148
"type": "string"
11521149
},
1150+
"python.missingPackage.severity":{
1151+
"default": "Hint",
1152+
"description": "%python.missingPackage.severity.description%",
1153+
"enum": [
1154+
"Error",
1155+
"Hint",
1156+
"Information",
1157+
"Warning"
1158+
],
1159+
"scope": "resource",
1160+
"type": "string",
1161+
"tags": [
1162+
"experimental"
1163+
]
1164+
},
11531165
"python.pipenvPath": {
11541166
"default": "pipenv",
11551167
"description": "%python.pipenvPath.description%",
@@ -1781,7 +1793,7 @@
17811793
"category": "Python",
17821794
"command": "python.clearWorkspaceInterpreter",
17831795
"title": "%python.command.python.clearWorkspaceInterpreter.title%",
1784-
"when": "!virtualWorkspace && shellExecutionSupported && editorLangId == python"
1796+
"when": "!virtualWorkspace && shellExecutionSupported"
17851797
},
17861798
{
17871799
"category": "Python",
@@ -2007,6 +2019,12 @@
20072019
"title": "%python.command.python.execInTerminalIcon.title%",
20082020
"when": "resourceLangId == python && !isInDiffEditor && !virtualWorkspace && shellExecutionSupported"
20092021
},
2022+
{
2023+
"command": "python.execInDedicatedTerminal",
2024+
"group": "navigation@0",
2025+
"title": "%python.command.python.execInDedicatedTerminal.title%",
2026+
"when": "resourceLangId == python && !isInDiffEditor && !virtualWorkspace && shellExecutionSupported"
2027+
},
20102028
{
20112029
"command": "python.debugInTerminal",
20122030
"group": "navigation@2",
@@ -2172,7 +2190,7 @@
21722190
"@types/stack-trace": "0.0.29",
21732191
"@types/tmp": "^0.0.33",
21742192
"@types/uuid": "^8.3.4",
2175-
"@types/vscode": "^1.75.0",
2193+
"@types/vscode": "^1.81.0",
21762194
"@types/which": "^2.0.1",
21772195
"@types/winreg": "^1.2.30",
21782196
"@types/xml2js": "0.4.9",

extensions/positron-python/package.nls.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"python.command.python.execInConsole.title": "Run Python File in Console",
1111
"python.command.python.debugInTerminal.title": "Debug Python File in Terminal",
1212
"python.command.python.execInTerminalIcon.title": "Run Python File in Terminal",
13+
"python.command.python.execInDedicatedTerminal.title": "Run Python File in Dedicated Terminal",
1314
"python.command.python.setInterpreter.title": "Select Interpreter",
1415
"python.command.python.clearWorkspaceInterpreter.title": "Clear Workspace Interpreter Setting",
1516
"python.command.python.viewOutput.title": "Show Output",
@@ -204,6 +205,7 @@
204205
"python.linting.pylintPath.deprecationMessage": "This setting will soon be deprecated. Please use the Pylint extension. Learn more here: https://aka.ms/AAlgvkb.",
205206
"python.logging.level.description": "The logging level the extension logs at, defaults to 'error'",
206207
"python.logging.level.deprecation": "This setting is deprecated. Please use command `Developer: Set Log Level...` to set logging level.",
208+
"python.missingPackage.severity.description": "Set severity of missing packages in requirements.txt or pyproject.toml",
207209
"python.pipenvPath.description": "Path to the pipenv executable to use for activation.",
208210
"python.poetryPath.description": "Path to the poetry executable.",
209211
"python.sortImports.args.description": "Arguments passed in. Each argument is a separate item in the array.",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"overrides": [
3+
{
4+
"files": ["**/main.d.ts"],
5+
"rules": {
6+
"@typescript-eslint/no-explicit-any": "off",
7+
"padding-line-between-statements": ["error", { "blankLine": "always", "prev": "export", "next": "*" }]
8+
}
9+
}
10+
]
11+
}

extensions/positron-python/pythonExtensionApi/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,22 @@ First we need to define a `package.json` for the extension that wants to use the
1717
// Depend on the Python extension facade npm module to get easier API access to the
1818
// core extension.
1919
"dependencies": {
20-
"@vscode/python-extension": "..."
20+
"@vscode/python-extension": "...",
21+
"@types/vscode": "..."
2122
},
2223
}
2324
```
2425

26+
Update `"@types/vscode"` to [a recent version](https://code.visualstudio.com/updates/) of VS Code, say `"^1.81.0"` for VS Code version `"1.81"`, in case there are any conflicts.
27+
2528
The actual source code to get the active environment to run some script could look like this:
2629

2730
```typescript
2831
// Import the API
2932
import { PythonExtension } from '@vscode/python-extension';
3033

34+
...
35+
3136
// Load the Python extension API
3237
const pythonApi: PythonExtension = await PythonExtension.api();
3338

extensions/positron-python/pythonExtensionApi/package-lock.json

Lines changed: 28 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/positron-python/pythonExtensionApi/package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@vscode/python-extension",
33
"description": "An API facade for the Python extension in VS Code",
4-
"version": "1.0.0",
4+
"version": "1.0.4",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -17,24 +17,26 @@
1717
"vscode": "^1.78.0"
1818
},
1919
"license": "MIT",
20-
"homepage": "https://github.com/Microsoft/vscode-python",
20+
"homepage": "https://github.com/microsoft/vscode-python/tree/main/pythonExtensionApi",
2121
"repository": {
2222
"type": "git",
2323
"url": "https://github.com/Microsoft/vscode-python"
2424
},
2525
"bugs": {
2626
"url": "https://github.com/Microsoft/vscode-python/issues"
2727
},
28-
"dependencies": {
28+
"devDependencies": {
29+
"typescript": "5.0.4",
2930
"@types/vscode": "^1.78.0"
3031
},
3132
"scripts": {
3233
"prepublishOnly": "echo \"⛔ Can only publish from a secure pipeline ⛔\" && node ../build/fail",
3334
"prepack": "npm run all:publish",
34-
"compile": "node ../node_modules/typescript/lib/tsc.js -b ./tsconfig.json",
35+
"compile": "node ./node_modules/typescript/lib/tsc.js -b ./tsconfig.json",
3536
"clean": "node ../node_modules/rimraf/bin.js out",
3637
"lint": "node ../node_modules/eslint/bin/eslint.js --ext ts src",
3738
"all": "npm run clean && npm run compile",
38-
"all:publish": "git clean -xfd . && npm install && npm run compile"
39+
"formatTypings": "node ../node_modules/eslint/bin/eslint.js --fix ./out/main.d.ts",
40+
"all:publish": "git clean -xfd . && npm install && npm run compile && npm run formatTypings"
3941
}
4042
}

0 commit comments

Comments
 (0)