Draft fix old ci

.devcontainer/Dockerfile

@@ -0,0 +1,18 @@
+FROM mcr.microsoft.com/devcontainers/typescript-node:16-bookworm
+
+RUN apt-get install -y wget bzip2
+
+# Run in silent mode and save downloaded script as anaconda.sh.
+# Run with /bin/bash and run in silent mode to /opt/conda.
+# Also get rid of installation script after finishing.
+RUN wget --quiet https://repo.anaconda.com/archive/Anaconda3-2023.07-1-Linux-x86_64.sh -O ~/anaconda.sh && \
+ /bin/bash ~/anaconda.sh -b -p /opt/conda && \
+ rm ~/anaconda.sh
+
+ENV PATH="/opt/conda/bin:$PATH"
+
+# Sudo apt update needs to run in order for installation of fish to work .
+RUN sudo apt update && \
+ sudo apt install fish -y
+
+

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+ "name": "VS Code Python Dev Container",
+ // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+ "build": {
+ "dockerfile": "./Dockerfile",
+ "context": ".."
+ },
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "editorconfig.editorconfig",
+ "esbenp.prettier-vscode",
+ "dbaeumer.vscode-eslint",
+ "ms-python.python",
+ "ms-python.black-formatter",
+ "ms-python.vscode-pylance",
+ "charliermarsh.ruff"
+ ]
+ }
+ },
+ // Commands to execute on container creation,start.
+ "postCreateCommand": "bash scripts/postCreateCommand.sh",
+ "onCreateCommand": "bash scripts/onCreateCommand.sh",
+
+ "containerEnv": {
+ "CI_PYTHON_PATH": "/workspaces/vscode-python/.venv/bin/python"
+ }
+
+}

.eslintignore

@@ -1,3 +1,5 @@
+pythonExtensionApi/out/
+
 # The following files were grandfathered out of eslint. They can be removed as time permits.
 
 src/test/analysisEngineTest.ts
@@ -48,8 +50,6 @@ src/test/testing/common/services/configSettingService.unit.test.ts
 
 src/test/common/exitCIAfterTestReporter.ts
 
-src/test/common/net/fileDownloader.unit.test.ts
-src/test/common/net/httpClient.unit.test.ts
 
 src/test/common/terminals/activator/index.unit.test.ts
 src/test/common/terminals/activator/base.unit.test.ts
@@ -76,7 +76,6 @@ src/test/common/platform/filesystem.test.ts
 
 src/test/common/utils/cacheUtils.unit.test.ts
 src/test/common/utils/decorators.unit.test.ts
-src/test/common/utils/localize.functional.test.ts
 src/test/common/utils/version.unit.test.ts
 
 src/test/common/configSettings/configSettings.unit.test.ts
@@ -108,7 +107,6 @@ src/test/common/interpreterPathService.unit.test.ts
 
 src/test/pythonFiles/formatting/dummy.ts
 
-src/test/debugger/extension/banner.unit.test.ts
 src/test/debugger/extension/adapter/adapter.test.ts
 src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts
 src/test/debugger/extension/adapter/factory.unit.test.ts
@@ -124,7 +122,6 @@ src/test/telemetry/index.unit.test.ts
 src/test/telemetry/envFileTelemetry.unit.test.ts
 
 src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts
-src/test/application/diagnostics/checks/pythonPathDeprecated.unit.test.ts
 src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts
 src/test/application/diagnostics/checks/invalidLaunchJsonDebugger.unit.test.ts
 src/test/application/diagnostics/checks/powerShellActivation.unit.test.ts
@@ -139,7 +136,6 @@ src/test/performance/load.perf.test.ts
 
 src/client/interpreter/configuration/interpreterSelector/commands/base.ts
 src/client/interpreter/configuration/interpreterSelector/commands/resetInterpreter.ts
-src/client/interpreter/configuration/interpreterSelector/commands/setShebangInterpreter.ts
 src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts
 src/client/interpreter/configuration/services/globalUpdaterService.ts
 src/client/interpreter/configuration/services/workspaceUpdaterService.ts
@@ -148,7 +144,6 @@ src/client/interpreter/helpers.ts
 src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts
 src/client/interpreter/display/index.ts
 
-src/client/api.ts
 src/client/extension.ts
 src/client/sourceMapSupport.ts
 src/client/startupTelemetry.ts
@@ -178,12 +173,9 @@ src/client/testing/common/runner.ts
 
 src/client/common/helpers.ts
 src/client/common/net/browser.ts
-src/client/common/net/fileDownloader.ts
-src/client/common/net/httpClient.ts
 src/client/common/net/socket/socketCallbackHandler.ts
 src/client/common/net/socket/socketServer.ts
 src/client/common/net/socket/SocketStream.ts
-src/client/common/asyncDisposableRegistry.ts
 src/client/common/editor.ts
 src/client/common/contextKey.ts
 src/client/common/experiments/telemetry.ts
@@ -208,10 +200,6 @@ src/client/common/terminal/shellDetectors/vscEnvironmentShellDetector.ts
 src/client/common/terminal/shellDetectors/terminalNameShellDetector.ts
 src/client/common/terminal/shellDetectors/settingsShellDetector.ts
 src/client/common/terminal/shellDetectors/baseShellDetector.ts
-src/client/common/terminal/environmentActivationProviders/baseActivationProvider.ts
-src/client/common/terminal/environmentActivationProviders/commandPrompt.ts
-src/client/common/terminal/environmentActivationProviders/bash.ts
-src/client/common/terminal/environmentActivationProviders/pyenvActivationProvider.ts
 src/client/common/utils/decorators.ts
 src/client/common/utils/enum.ts
 src/client/common/utils/platform.ts

.github/actions/build-vsix/action.yml

@@ -29,7 +29,7 @@ runs:
  cache: 'pip'
  cache-dependency-path: |
  requirements.txt
- build/debugger-install-requirements.txt
+ build/build-install-requirements.txt
  pythonFiles/jedilsp_requirements/requirements.txt
 
  - name: Upgrade Pip
@@ -46,10 +46,11 @@ runs:
  with:
  options: '-t ./pythonFiles/lib/python --implementation py'
 
- - name: Install debugpy
+ - name: Install debugpy and get-pip
  run: |
- python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
+ python -m pip --disable-pip-version-check install packaging
  python ./pythonFiles/install_debugpy.py
+ python ./pythonFiles/download_get_pip.py
  shell: bash
 
  - name: Install Jedi LSP

.github/actions/lint/action.yml

@@ -47,3 +47,10 @@ runs:
  python -m black . --check
  working-directory: pythonFiles
  shell: bash
+
+ - name: Run Ruff
+ run: |
+ python -m pip install -U ruff
+ python -m ruff check .
+ working-directory: pythonFiles
+ shell: bash

.github/actions/smoke-tests/action.yml

@@ -26,7 +26,6 @@ runs:
  cache-dependency-path: |
  build/test-requirements.txt
  requirements.txt
- build/smoke-test-requirements.txt
 
  - name: Install dependencies (npm ci)
  run: npm ci --prefer-offline
@@ -43,11 +42,6 @@ runs:
  python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy
  shell: bash
 
- - name: pip install smoke test requirements
- run: |
- python -m pip install --upgrade -r build/smoke-test-requirements.txt
- shell: bash
-
  # Bits from the VSIX are reused by smokeTest.ts to speed things up.
  - name: Download VSIX
  uses: actions/download-artifact@v2

.github/release_plan.md

@@ -1,6 +1,6 @@
 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.
 
-Feature freeze is Monday @ 17:00 America/Vancouver, XXX XX.
+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.
 
 
 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
 - [ ] Manually add/fix any 3rd-party licenses as appropriate based on what the internal build pipeline detects.
 - [ ] Open appropriate [documentation issues](https://github.com/microsoft/vscode-docs/issues?q=is%3Aissue+is%3Aopen+label%3Apython).
 - [ ] Contact the PM team to begin drafting a blog post.
+- [ ] Announce to the development team that `main` is open again.
 
 
 # Release (Wednesday, XXX XX)

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
  - 'release-*'
 
 env:
- NODE_VERSION: 14.18.2
+ NODE_VERSION: 16.17.1
  PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
  # Force a path with spaces and to test extension works in these scenarios
  # Unicode characters are causing 2.7 failures so skip that for now.
@@ -103,6 +103,7 @@ jobs:
  - name: Run Pyright
  uses: jakebailey/pyright-action@v1
  with:
+ version: 1.1.308
  working-directory: 'pythonFiles'
 
  ### Non-smoke tests
@@ -146,6 +147,13 @@ jobs:
  with:
  python-version: ${{ matrix.python }}
 
+ - name: Download get-pip.py
+ run: |
+ python -m pip install wheel
+ python -m pip install -r build/build-install-requirements.txt
+ python ./pythonFiles/download_get_pip.py
+ shell: bash
+
  - name: Install debugpy
  run: |
  # We need to have debugpy so that tests relying on it keep passing, but we don't need install_debugpy's logic in the test phase.
@@ -171,7 +179,7 @@ jobs:
  - name: Install debugpy wheels (Python ${{ matrix.python }})
  run: |
  python -m pip install wheel
- python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
+ python -m pip install -r build/build-install-requirements.txt
  python ./pythonFiles/install_debugpy.py
  shell: bash
  if: matrix.test-suite == 'debugger'

.github/workflows/community-feedback-auto-comment.yml

@@ -0,0 +1,28 @@
+name: Community Feedback Auto Comment
+
+on:
+ issues:
+ types:
+ - labeled
+jobs:
+ add-comment:
+ if: github.event.label.name == 'needs community feedback'
+ runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ steps:
+ - name: Check For Existing Comment
+ uses: peter-evans/find-comment@v2
+ id: finder
+ with:
+ issue-number: ${{ github.event.issue.number }}
+ comment-author: 'github-actions[bot]'
+ body-includes: 'Thanks for the feature request! We are going to give the community'
+
+ - name: Add Community Feedback Comment
+ if: steps.finder.outputs.comment-id == ''
+ uses: peter-evans/create-or-update-comment@v3
+ with:
+ issue-number: ${{ github.event.issue.number }}
+ body: |
+ Thanks for the feature request! We are going to give the community 60 days from when this issue was created to provide 7 👍 upvotes on the opening comment to gauge general interest in this idea. If there's enough upvotes then we will consider this feature request in our future planning. If there's unfortunately not enough upvotes then we will close this issue.

.github/workflows/info-needed-closer.yml

@@ -0,0 +1,28 @@
+name: Info-Needed Closer
+on:
+ schedule:
+ - cron: 20 12 * * * # 5:20am Redmond
+ repository_dispatch:
+ types: [trigger-needs-more-info]
+ workflow_dispatch:
+
+jobs:
+ main:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout Actions
+ uses: actions/checkout@v3
+ with:
+ repository: 'microsoft/vscode-github-triage-actions'
+ path: ./actions
+ ref: stable
+ - name: Install Actions
+ run: npm install --production --prefix ./actions
+ - name: Run info-needed Closer
+ uses: ./actions/needs-more-info-closer
+ with:
+ label: info-needed
+ closeDays: 30
+ closeComment: "Because we have not heard back with the information we requested, we are closing this issue for now. If you are able to provide the info later on, then we will be happy to re-open this issue to pick up where we left off. \n\nHappy Coding!"
+ pingDays: 30
+ pingComment: "Hey @${assignee}, this issue might need further attention.\n\n@${author}, you can help us out by closing this issue if the problem no longer exists, or adding more information."

.github/workflows/issue-labels.yml

@@ -6,8 +6,8 @@ on:
 
 env:
  # To update the list of labels, see `getLabels.js`.
- REPO_LABELS: '["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"]'
- TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd"]'
+ 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"]'
+ TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd","anthonykim1"]'
 
 permissions:
  issues: write
@@ -18,55 +18,19 @@ jobs:
  name: "Add 'triage-needed' and remove unrecognizable labels & assignees"
  runs-on: ubuntu-latest
  steps:
- - uses: actions/github-script@v6
+ - name: Checkout Actions
+ uses: actions/checkout@v3
  with:
- github-token: ${{ secrets.GITHUB_TOKEN }}
- script: |
- const result = await github.rest.issues.listLabelsOnIssue({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.issue.number,
- })
- const labels = result.data.map((label) => label.name)
- const hasNeedsOrTPI = labels.some((label) => (label.startsWith('needs') || label === 'testplan-item' || label.startsWith('iteration-plan') || label === 'release-plan'))
+ repository: 'microsoft/vscode-github-triage-actions'
+ ref: stable
+ path: ./actions
 
-  if (!hasNeedsOrTPI) {
-  console.log('This issue is not labeled with a "needs __", "iteration-plan", "release-plan", or the "testplan-item" label; add the "triage-needed" label.')
+ - name: Install Actions
+ run: npm install --production --prefix ./actions
 
- github.rest.issues.addLabels({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.issue.number,
- labels: ['triage-needed']
- })
- } else {
- console.log('This issue already has a "needs __", "iteration-plan", "release-plan", or the "testplan-item" label, do not add the "triage-needed" label.')
- }
- const knownTriagers = ${{ env.TRIAGERS }}
- const currentAssignees = await github.rest.issues
- .get({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.issue.number,
- })
- .then((result) => result.data.assignees.map((a) => a.login));
- console.log('Known triagers:', JSON.stringify(knownTriagers));
- console.log('Current assignees:', JSON.stringify(currentAssignees));
- const assigneesToRemove = currentAssignees.filter(a => !knownTriagers.includes(a));
- console.log('Assignees to remove:', JSON.stringify(assigneesToRemove));
- github.rest.issues.removeAssignees({
- owner: context.repo.owner,
- repo: context.repo.repo,
- issue_number: context.issue.number,
- assignees: assigneesToRemove,
- });
- const knownLabels = ${{ env.REPO_LABELS }}
- for( const label of labels) {
- if (!knownLabels.includes(label)) {
- await github.rest.issues.deleteLabel({
- owner: context.repo.owner,
- repo: context.repo.repo,
- name: label,
- })
- }
- }
+ - name: "Add 'triage-needed' and remove unrecognizable labels & assignees"
+ uses: ./actions/python-issue-labels
+ with:
+ triagers: ${{ env.TRIAGERS }}
+ token: ${{secrets.GITHUB_TOKEN}}
+ repo_labels: ${{ env.REPO_LABELS }}

.github/workflows/lock-issues.yml

@@ -15,7 +15,8 @@ jobs:
  lock-issues:
  runs-on: ubuntu-latest
  steps:
- - uses: dessant/lock-threads@v4
+ - name: 'Lock Issues'
+ uses: dessant/lock-threads@v4
  with:
  github-token: ${{ github.token }}
  issue-inactive-days: '30'