Revert vscode engine bump, task proposed api #1258
Closed
anthonykim1 wants to merge 13 commits intorelease/1.20from
Closed
Revert vscode engine bump, task proposed api #1258anthonykim1 wants to merge 13 commits intorelease/1.20from
anthonykim1 wants to merge 13 commits intorelease/1.20from
Conversation
Bumps [qs](https://github.com/ljharb/qs) from 6.14.1 to 6.15.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/ljharb/qs/blob/main/CHANGELOG.md">qs's changelog</a>.</em></p> <blockquote> <h2><strong>6.15.0</strong></h2> <ul> <li>[New] <code>parse</code>: add <code>strictMerge</code> option to wrap object/primitive conflicts in an array (<a href="https://redirect.github.com/ljharb/qs/issues/425">#425</a>, <a href="https://redirect.github.com/ljharb/qs/issues/122">#122</a>)</li> <li>[Fix] <code>duplicates</code> option should not apply to bracket notation keys (<a href="https://redirect.github.com/ljharb/qs/issues/514">#514</a>)</li> </ul> <h2><strong>6.14.2</strong></h2> <ul> <li>[Fix] <code>parse</code>: mark overflow objects for indexed notation exceeding <code>arrayLimit</code> (<a href="https://redirect.github.com/ljharb/qs/issues/546">#546</a>)</li> <li>[Fix] <code>arrayLimit</code> means max count, not max index, in <code>combine</code>/<code>merge</code>/<code>parseArrayValue</code></li> <li>[Fix] <code>parse</code>: throw on <code>arrayLimit</code> exceeded with indexed notation when <code>throwOnLimitExceeded</code> is true (<a href="https://redirect.github.com/ljharb/qs/issues/529">#529</a>)</li> <li>[Fix] <code>parse</code>: enforce <code>arrayLimit</code> on <code>comma</code>-parsed values</li> <li>[Fix] <code>parse</code>: fix error message to reflect arrayLimit as max index; remove extraneous comments (<a href="https://redirect.github.com/ljharb/qs/issues/545">#545</a>)</li> <li>[Robustness] avoid <code>.push</code>, use <code>void</code></li> <li>[readme] document that <code>addQueryPrefix</code> does not add <code>?</code> to empty output (<a href="https://redirect.github.com/ljharb/qs/issues/418">#418</a>)</li> <li>[readme] clarify <code>parseArrays</code> and <code>arrayLimit</code> documentation (<a href="https://redirect.github.com/ljharb/qs/issues/543">#543</a>)</li> <li>[readme] replace runkit CI badge with shields.io check-runs badge</li> <li>[meta] fix changelog typo (<code>arrayLength</code> → <code>arrayLimit</code>)</li> <li>[actions] fix rebase workflow permissions</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/ljharb/qs/commit/d9b4c66303375493c68c42d68e363e50b1753771"><code>d9b4c66</code></a> v6.15.0</li> <li><a href="https://github.com/ljharb/qs/commit/cb41a545a32422ad3044584d3c4fa8f953552605"><code>cb41a54</code></a> [New] <code>parse</code>: add <code>strictMerge</code> option to wrap object/primitive conflicts in...</li> <li><a href="https://github.com/ljharb/qs/commit/88e15636da953397262bd3014ab8b0d17d5c8039"><code>88e1563</code></a> [Fix] <code>duplicates</code> option should not apply to bracket notation keys</li> <li><a href="https://github.com/ljharb/qs/commit/9d441d270486c3cc77f17289a9e0921c0f742aff"><code>9d441d2</code></a> Merge backport release tags v6.0.6–v6.13.3 into main</li> <li><a href="https://github.com/ljharb/qs/commit/85cc8cac6b444c9b4cb1172a151ac8fdee0a0301"><code>85cc8ca</code></a> v6.12.5</li> <li><a href="https://github.com/ljharb/qs/commit/ffc12aa71030f508ab28cccbb1987424abf52379"><code>ffc12aa</code></a> v6.11.4</li> <li><a href="https://github.com/ljharb/qs/commit/0506b11e457f6b3847b1dcf65b5c11c0eaf5dfb9"><code>0506b11</code></a> [actions] update reusable workflows</li> <li><a href="https://github.com/ljharb/qs/commit/6a37fafc75ce8a3d00ef611c9d7acfccc6ec449c"><code>6a37faf</code></a> [actions] update reusable workflows</li> <li><a href="https://github.com/ljharb/qs/commit/8e8df5a3b147ec2f86830c2e3de1016a7ecbc18b"><code>8e8df5a</code></a> [Fix] fix regressions from robustness refactor</li> <li><a href="https://github.com/ljharb/qs/commit/d60bab35a42b3c789d7a1461ea176eaee74eb751"><code>d60bab3</code></a> v6.10.7</li> <li>Additional commits viewable in <a href="https://github.com/ljharb/qs/compare/v6.14.1...v6.15.0">compare view</a></li> </ul> </details> <br /> [](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 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) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/vscode-python-environments/network/alerts). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#1240) This PR adds an `execProcess` wrapper to `childProcess.apis.ts` and refactors `poetryUtils.ts` to use it, improving testability. **Changes:** - Added `execProcess` function to `src/common/childProcess.apis.ts` as a wrapper around `cp.exec` with `PYTHONUTF8` handling - Refactored `src/managers/poetry/poetryUtils.ts` to use `execProcess` instead of direct `child_process` import - Fixed a pre-existing regex bug in `getPoetryVersion` that didn't handle the space in Poetry 1.x version output format - Added unit tests in `poetryUtils.unit.test.ts` demonstrating the mocking pattern for `execProcess` **Testing:** - All unit tests pass (660 passing) - Lint passes with no errors **Note:** This is a partial implementation of #1239. The acceptance criteria for auditing `fs` imports is deferred to a future PR to keep this change focused. For #1239
should fix build failures on main
…1248) ## Summary On Windows with Git Bash as the default terminal, the extension was attempting to activate conda environments using `activate.bat` (CMD batch script), which fails in bash: ```bash $ source C:/Tools/miniforge3/Scripts/activate.bat pipes bash: C:/Tools/miniforge3/Scripts/activate.bat: line 1: syntax error near unexpected token `(' ``` ## Root Cause The `windowsExceptionGenerateConfig` function was using the same `sourceInitPath` (which is `activate.bat` on Windows) for all shells, including Git Bash. ## Fix - Pass `conda.sh` path to `windowsExceptionGenerateConfig` for proper bash-based shell activation - Use two commands for bash when `conda.sh` is available: `source <conda.sh>` + `conda activate <env>` - Skip Git Bash activation entirely when `conda.sh` is unavailable and `sourceInitPath` is `.bat` - Refactored `shellSourcingScripts` from array with fragile indices to typed `ShellSourcingScripts` interface ## Changes - [condaUtils.ts](src/managers/conda/condaUtils.ts): Extract and pass `condaShPath` to `windowsExceptionGenerateConfig`, use two-command activation for bash, skip activation when only `.bat` is available - [condaSourcingUtils.ts](src/managers/conda/condaSourcingUtils.ts): Add `ShellSourcingScripts` interface replacing fragile array indices - [condaUtils.windowsActivation.unit.test.ts](src/test/managers/conda/condaUtils.windowsActivation.unit.test.ts): Add unit tests for Windows shell activation ## Testing - Pre-commit checks pass (lint, tsc, unit tests) - Manual testing needed on Windows with Git Bash + conda Fixes #1247
…) (#1249) Adds support for `WORKON_HOME` and `XDG_DATA_HOME` environment variables when discovering pipenv virtualenv directories. ## Changes - Added `getPipenvVirtualenvDirs()` function to `pipenvUtils.ts` that returns directories where pipenv virtualenvs may be stored - Added comprehensive unit tests for the new function - Added verbose tracing for debugging discovery issues ## Discovery Priority The function checks these locations in priority order: 1. `WORKON_HOME` (if set and exists) - commonly shared with virtualenvwrapper 2. `XDG_DATA_HOME/virtualenvs` (if XDG_DATA_HOME is set and path exists) 3. `~/.local/share/virtualenvs` (Linux/macOS default) 4. `~/.virtualenvs` (Windows default) ## Testing - 8 unit tests covering all env var scenarios, priority ordering, deduplication, and tilde expansion - Tests use real temp directories for filesystem operations (since `fs.existsSync` cannot be stubbed) - Cross-platform compatible (tested on Windows, patterns work for Linux/macOS) Fixes #1185
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We dont want to block env extension rollout with dc50906
Given task api added in July: microsoft/vscode#254477 1.103, we can go back to 1.106 that was before the commit dc50906
Revert dc50906