Skip to content

Commit e080a03

Browse files
authored
Merge branch 'main' into reloading921
2 parents 139f374 + ec67825 commit e080a03

File tree

142 files changed

+2492
-2045
lines changed

Some content is hidden

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

142 files changed

+2492
-2045
lines changed

.eslintrc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"mocha": true
66
},
77
"parser": "@typescript-eslint/parser",
8-
"plugins": ["@typescript-eslint"],
8+
"plugins": [
9+
"@typescript-eslint",
10+
"no-only-tests"
11+
],
912
"extends": [
1013
"airbnb",
1114
"plugin:@typescript-eslint/recommended",
@@ -97,6 +100,7 @@
97100
}
98101
],
99102
"operator-assignment": "off",
100-
"strict": "off"
103+
"strict": "off",
104+
"no-only-tests/no-only-tests": ["error", { "block": ["test", "suite"], "focus": ["only"] }]
101105
}
102106
}

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- 'release-*'
1010

1111
env:
12-
NODE_VERSION: 18.17.1
12+
NODE_VERSION: 20.18.0
1313
PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
1414
# Force a path with spaces and to test extension works in these scenarios
1515
# Unicode characters are causing 2.7 failures so skip that for now.
@@ -165,7 +165,7 @@ jobs:
165165
# macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
166166
os: [ubuntu-latest, windows-latest]
167167
# Run the tests on the oldest and most recent versions of Python.
168-
python: ['3.8', '3.x', '3.12-dev']
168+
python: ['3.8', '3.x', '3.13-dev']
169169

170170
steps:
171171
- name: Checkout

.github/workflows/pr-check.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- release*
99

1010
env:
11-
NODE_VERSION: 18.17.1
11+
NODE_VERSION: 20.18.0
1212
PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
1313
MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
1414
ARTIFACT_NAME_VSIX: ms-python-insiders-vsix
@@ -147,7 +147,7 @@ jobs:
147147
# macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
148148
os: [ubuntu-latest, windows-latest]
149149
# Run the tests on the oldest and most recent versions of Python.
150-
python: ['3.8', '3.x'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release
150+
python: ['3.8', '3.x', '3.13-dev'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release
151151
pytest-version: ['pytest', 'pytest@pre-release', 'pytest==6.2.0']
152152

153153
steps:
@@ -461,6 +461,7 @@ jobs:
461461
name: Coverage
462462
# The value of runs-on is the OS of the current job (specified in the strategy matrix below) instead of being hardcoded.
463463
runs-on: ${{ matrix.os }}
464+
needs: [lint, check-types, python-tests, tests, native-tests]
464465
strategy:
465466
fail-fast: false
466467
matrix:

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.17.1
1+
v20.18.0

build/azure-pipeline.pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extends:
6666
buildSteps:
6767
- task: NodeTool@0
6868
inputs:
69-
versionSpec: '18.17.1'
69+
versionSpec: '20.18.0'
7070
displayName: Select Node version
7171

7272
- task: UsePythonVersion@0
@@ -107,7 +107,7 @@ extends:
107107
buildType: 'specific'
108108
project: 'Monaco'
109109
definition: 591
110-
buildVersionToDownload: 'latestFromBranch'
110+
buildVersionToDownload: 'latest'
111111
branchName: 'refs/heads/main'
112112
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
113113
artifactName: 'bin-$(vsceTarget)'

build/azure-pipeline.stable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extends:
6161
buildSteps:
6262
- task: NodeTool@0
6363
inputs:
64-
versionSpec: '18.17.1'
64+
versionSpec: '20.18.0'
6565
displayName: Select Node version
6666

6767
- task: UsePythonVersion@0
@@ -103,7 +103,7 @@ extends:
103103
project: 'Monaco'
104104
definition: 593
105105
buildVersionToDownload: 'latestFromBranch'
106-
branchName: 'refs/heads/release/2024.14'
106+
branchName: 'refs/heads/release/2024.18'
107107
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
108108
artifactName: 'bin-$(vsceTarget)'
109109
itemPattern: |

build/azure-pipelines/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ extends:
3737
testPlatforms:
3838
- name: Linux
3939
nodeVersions:
40-
- 18.17.1
40+
- 20.18.0
4141
- name: MacOS
4242
nodeVersions:
43-
- 18.17.1
43+
- 20.18.0
4444
- name: Windows
4545
nodeVersions:
46-
- 18.17.1
46+
- 20.18.0
4747
testSteps:
4848
- template: /build/azure-pipelines/templates/test-steps.yml@self
4949
parameters:

build/test-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ django-stubs
3131
# for coverage
3232
coverage
3333
pytest-cov
34+
35+
# for pytest-describe related tests
36+
pytest-describe

noxfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def install_python_libs(session: nox.Session):
5353
)
5454

5555
session.install("packaging")
56+
session.install("debugpy")
5657

5758
# Download get-pip script
5859
session.run(

package-lock.json

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

0 commit comments

Comments
 (0)