Skip to content

Commit 27783ce

Browse files
karthiknadigkarthiknadig
authored
Rename pythonFiles to python_files (#22921)
1 parent c330ff9 commit 27783ce

File tree

337 files changed

+140
-2704
lines changed

Some content is hidden

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

337 files changed

+140
-2704
lines changed

‎.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ src/test/common/process/proc.unit.test.ts
105105
src/test/common/interpreterPathService.unit.test.ts
106106

107107

108-
src/test/pythonFiles/formatting/dummy.ts
108+
src/test/python_files/formatting/dummy.ts
109109

110110
src/test/debugger/extension/adapter/adapter.test.ts
111111
src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
cache-dependency-path: |
3131
requirements.txt
3232
build/build-install-requirements.txt
33-
pythonFiles/jedilsp_requirements/requirements.txt
33+
python_files/jedilsp_requirements/requirements.txt
3434
3535
- name: Upgrade Pip
3636
run: python -m pip install -U pip
@@ -44,20 +44,20 @@ runs:
4444
- name: Install Python dependencies
4545
uses: brettcannon/pip-secure-install@v1
4646
with:
47-
options: '-t ./pythonFiles/lib/python --implementation py'
47+
options: '-t ./python_files/lib/python --implementation py'
4848

4949
- name: Install debugpy and get-pip
5050
run: |
5151
python -m pip --disable-pip-version-check install packaging
52-
python ./pythonFiles/install_debugpy.py
53-
python ./pythonFiles/download_get_pip.py
52+
python ./python_files/install_debugpy.py
53+
python ./python_files/download_get_pip.py
5454
shell: bash
5555

5656
- name: Install Jedi LSP
5757
uses: brettcannon/pip-secure-install@v1
5858
with:
59-
requirements-file: './pythonFiles/jedilsp_requirements/requirements.txt'
60-
options: '-t ./pythonFiles/lib/jedilsp --implementation py --platform any --abi none'
59+
requirements-file: './python_files/jedilsp_requirements/requirements.txt'
60+
options: '-t ./python_files/lib/jedilsp --implementation py --platform any --abi none'
6161

6262
- name: Run npm ci
6363
run: npm ci --prefer-offline

‎.github/actions/lint/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ runs:
4545
run: |
4646
python -m pip install -U black
4747
python -m black . --check
48-
working-directory: pythonFiles
48+
working-directory: python_files
4949
shell: bash
5050

5151
- name: Run Ruff
5252
run: |
5353
python -m pip install -U ruff
5454
python -m ruff check .
55-
working-directory: pythonFiles
55+
working-directory: python_files
5656
shell: bash

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ runs:
3434
- name: Install Python requirements
3535
uses: brettcannon/pip-secure-install@v1
3636
with:
37-
options: '-t ./pythonFiles/lib/python --implementation py'
37+
options: '-t ./python_files/lib/python --implementation py'
3838

3939
- name: pip install system test requirements
4040
run: |
4141
python -m pip install --upgrade -r build/test-requirements.txt
42-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy
42+
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
4343
shell: bash
4444

4545
# Bits from the VSIX are reused by smokeTest.ts to speed things up.

‎.github/release_plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ NOTE: the number of this release is in the issue title and can be substituted in
3737
- [ ] Create a new branch called **`bump-release-[YYYY.minor]`**.
3838
- [ ] Change the version in `package.json` to the next **even** number and switch the `-dev` to `-rc`. (🤖)
3939
- [ ] Run `npm install` to make sure `package-lock.json` is up-to-date _(you should now see changes to the `package.json` and `package-lock.json` at this point which update the version number **only**)_. (🤖)
40-
- [ ] Check [debugpy on PyPI](https://pypi.org/project/debugpy/) for a new release and update the version of debugpy in [`install_debugpy.py`](https://github.com/microsoft/vscode-python/blob/main/pythonFiles/install_debugpy.py) if necessary.
40+
- [ ] Check [debugpy on PyPI](https://pypi.org/project/debugpy/) for a new release and update the version of debugpy in [`install_debugpy.py`](https://github.com/microsoft/vscode-python/blob/main/python_files/install_debugpy.py) if necessary.
4141
- [ ] Update `ThirdPartyNotices-Repository.txt` as appropriate. You can check by looking at the [commit history](https://github.com/microsoft/vscode-python/commits/main) and scrolling through to see if there's anything listed there which might have pulled in some code directly into the repository from somewhere else. If you are still unsure you can check with the team.
4242
- [ ] Create a PR from your branch **`bump-release-[YYYY.minor]`** to `main`. Add the `"no change-log"` tag to the PR so it does not show up on the release notes before merging it.
4343

‎.github/workflows/build.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,24 @@ jobs:
8787
- name: Install core Python requirements
8888
uses: brettcannon/pip-secure-install@v1
8989
with:
90-
options: '-t ./pythonFiles/lib/python --no-cache-dir --implementation py'
90+
options: '-t ./python_files/lib/python --no-cache-dir --implementation py'
9191

9292
- name: Install Jedi requirements
9393
uses: brettcannon/pip-secure-install@v1
9494
with:
95-
requirements-file: './pythonFiles/jedilsp_requirements/requirements.txt'
96-
options: '-t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py'
95+
requirements-file: './python_files/jedilsp_requirements/requirements.txt'
96+
options: '-t ./python_files/lib/jedilsp --no-cache-dir --implementation py'
9797

9898
- name: Install other Python requirements
9999
run: |
100-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
100+
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
101101
python -m pip install --upgrade -r build/test-requirements.txt
102102
103103
- name: Run Pyright
104104
uses: jakebailey/pyright-action@v2
105105
with:
106106
version: 1.1.308
107-
working-directory: 'pythonFiles'
107+
working-directory: 'python_files'
108108

109109
python-tests:
110110
name: Python Tests
@@ -137,13 +137,13 @@ jobs:
137137
uses: brettcannon/pip-secure-install@v1
138138
with:
139139
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
140-
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
140+
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
141141

142142
- name: Install test requirements
143143
run: python -m pip install --upgrade -r build/test-requirements.txt
144144

145145
- name: Run Python unit tests
146-
run: python pythonFiles/tests/run_all.py
146+
run: python python_files/tests/run_all.py
147147

148148
tests:
149149
name: Tests
@@ -192,26 +192,26 @@ jobs:
192192
run: |
193193
python -m pip install wheel
194194
python -m pip install -r build/build-install-requirements.txt
195-
python ./pythonFiles/download_get_pip.py
195+
python ./python_files/download_get_pip.py
196196
shell: bash
197197

198198
- name: Install debugpy
199199
run: |
200200
# 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.
201-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
201+
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
202202
203203
- name: Install core Python requirements
204204
uses: brettcannon/pip-secure-install@v1
205205
with:
206206
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
207-
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
207+
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
208208
if: startsWith(matrix.python, 3.)
209209

210210
- name: Install Jedi requirements
211211
uses: brettcannon/pip-secure-install@v1
212212
with:
213-
requirements-file: '"${{ env.special-working-directory-relative }}/pythonFiles/jedilsp_requirements/requirements.txt"'
214-
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/jedilsp" --no-cache-dir --implementation py'
213+
requirements-file: '"${{ env.special-working-directory-relative }}/python_files/jedilsp_requirements/requirements.txt"'
214+
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/jedilsp" --no-cache-dir --implementation py'
215215
if: startsWith(matrix.python, 3.)
216216

217217
- name: Install test requirements
@@ -221,7 +221,7 @@ jobs:
221221
run: |
222222
python -m pip install wheel
223223
python -m pip install -r build/build-install-requirements.txt
224-
python ./pythonFiles/install_debugpy.py
224+
python ./python_files/install_debugpy.py
225225
shell: bash
226226
if: matrix.test-suite == 'debugger'
227227

‎.github/workflows/pr-check.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,24 +61,24 @@ jobs:
6161
- name: Install base Python requirements
6262
uses: brettcannon/pip-secure-install@v1
6363
with:
64-
options: '-t ./pythonFiles/lib/python --no-cache-dir --implementation py'
64+
options: '-t ./python_files/lib/python --no-cache-dir --implementation py'
6565

6666
- name: Install Jedi requirements
6767
uses: brettcannon/pip-secure-install@v1
6868
with:
69-
requirements-file: './pythonFiles/jedilsp_requirements/requirements.txt'
70-
options: '-t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py'
69+
requirements-file: './python_files/jedilsp_requirements/requirements.txt'
70+
options: '-t ./python_files/lib/jedilsp --no-cache-dir --implementation py'
7171

7272
- name: Install other Python requirements
7373
run: |
74-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
74+
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
7575
python -m pip install --upgrade -r build/test-requirements.txt
7676
7777
- name: Run Pyright
7878
uses: jakebailey/pyright-action@v2
7979
with:
8080
version: 1.1.308
81-
working-directory: 'pythonFiles'
81+
working-directory: 'python_files'
8282

8383
python-tests:
8484
name: Python Tests
@@ -124,13 +124,13 @@ jobs:
124124
uses: brettcannon/pip-secure-install@v1
125125
with:
126126
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
127-
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
127+
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
128128

129129
- name: Install test requirements
130130
run: python -m pip install --upgrade -r build/test-requirements.txt
131131

132132
- name: Run Python unit tests
133-
run: python pythonFiles/tests/run_all.py
133+
run: python python_files/tests/run_all.py
134134

135135
tests:
136136
name: Tests
@@ -179,26 +179,26 @@ jobs:
179179
- name: Install debugpy
180180
run: |
181181
# 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.
182-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
182+
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
183183
184184
- name: Download get-pip.py
185185
run: |
186186
python -m pip install wheel
187187
python -m pip install -r build/build-install-requirements.txt
188-
python ./pythonFiles/download_get_pip.py
188+
python ./python_files/download_get_pip.py
189189
shell: bash
190190

191191
- name: Install base Python requirements
192192
uses: brettcannon/pip-secure-install@v1
193193
with:
194194
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
195-
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
195+
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
196196

197197
- name: Install Jedi requirements
198198
uses: brettcannon/pip-secure-install@v1
199199
with:
200-
requirements-file: '"${{ env.special-working-directory-relative }}/pythonFiles/jedilsp_requirements/requirements.txt"'
201-
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/jedilsp" --no-cache-dir --implementation py'
200+
requirements-file: '"${{ env.special-working-directory-relative }}/python_files/jedilsp_requirements/requirements.txt"'
201+
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/jedilsp" --no-cache-dir --implementation py'
202202

203203
- name: Install test requirements
204204
run: python -m pip install --upgrade -r build/test-requirements.txt
@@ -207,7 +207,7 @@ jobs:
207207
run: |
208208
python -m pip install wheel
209209
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
210-
python ./pythonFiles/install_debugpy.py
210+
python ./python_files/install_debugpy.py
211211
shell: bash
212212
if: matrix.test-suite == 'debugger'
213213

@@ -393,25 +393,25 @@ jobs:
393393
cache: 'pip'
394394
cache-dependency-path: |
395395
requirements.txt
396-
pythonFiles/jedilsp_requirements/requirements.txt
396+
python_files/jedilsp_requirements/requirements.txt
397397
build/test-requirements.txt
398398
build/functional-test-requirements.txt
399399
400400
- name: Install base Python requirements
401401
uses: brettcannon/pip-secure-install@v1
402402
with:
403-
options: '-t ./pythonFiles/lib/python --implementation py'
403+
options: '-t ./python_files/lib/python --implementation py'
404404

405405
- name: Install Jedi requirements
406406
uses: brettcannon/pip-secure-install@v1
407407
with:
408-
requirements-file: './pythonFiles/jedilsp_requirements/requirements.txt'
409-
options: '-t ./pythonFiles/lib/jedilsp --implementation py'
408+
requirements-file: './python_files/jedilsp_requirements/requirements.txt'
409+
options: '-t ./python_files/lib/jedilsp --implementation py'
410410

411411
- name: Install debugpy
412412
run: |
413413
# 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.
414-
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy
414+
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
415415
416416
- name: Install test requirements
417417
run: python -m pip install --upgrade -r build/test-requirements.txt
@@ -487,7 +487,7 @@ jobs:
487487

488488
- name: Run Python unit tests
489489
run: |
490-
python pythonFiles/tests/run_all.py
490+
python python_files/tests/run_all.py
491491
492492
# The virtual environment based tests use the `testSingleWorkspace` set of tests
493493
# with the environment variable `TEST_FILES_SUFFIX` set to `testvirtualenvs`,

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ cucumber-report.json
2323
**/.venv*/
2424
port.txt
2525
precommit.hook
26-
pythonFiles/lib/**
27-
pythonFiles/get-pip.py
26+
python_files/lib/**
27+
python_files/get-pip.py
2828
debug_coverage*/**
2929
languageServer/**
3030
languageServer.*/**

‎.vscode/launch.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,18 +249,18 @@
249249
},
250250
{
251251
"name": "Listen",
252-
"type": "python",
252+
"type": "debugpy",
253253
"request": "attach",
254254
"listen": { "host": "localhost", "port": 5678 },
255255
"justMyCode": true
256256
},
257257
{
258258
"name": "Debug pytest plugin tests",
259259

260-
"type": "python",
260+
"type": "debugpy",
261261
"request": "launch",
262262
"module": "pytest",
263-
"args": ["${workspaceFolder}/pythonFiles/tests/pytestadapter"],
263+
"args": ["${workspaceFolder}/python_files/tests/pytestadapter"],
264264
"justMyCode": true
265265
}
266266
],

‎.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
// Open merge editor for resolving conflicts.
6565
"git.mergeEditor": true,
6666
"python.testing.pytestArgs": [
67-
"pythonFiles/tests"
67+
"python_files/tests"
6868
],
6969
"python.testing.unittestEnabled": false,
7070
"python.testing.pytestEnabled": true

‎.vscodeignore

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ obj/**
5151
out/**/*.stats.json
5252
out/client/**/*.analyzer.html
5353
out/coverconfig.json
54-
out/pythonFiles/**
54+
out/python_files/**
5555
out/src/**
5656
out/test/**
5757
out/testMultiRootWkspc/**
5858
precommit.hook
59-
pythonFiles/**/*.pyc
60-
pythonFiles/lib/**/*.egg-info/**
61-
pythonFiles/lib/python/bin/**
62-
pythonFiles/jedilsp_requirements/**
63-
pythonFiles/tests/**
59+
python_files/**/*.pyc
60+
python_files/lib/**/*.egg-info/**
61+
python_files/lib/python/bin/**
62+
python_files/jedilsp_requirements/**
63+
python_files/tests/**
6464
scripts/**
6565
src/**
6666
test/**

‎build/azure-pipeline.pre-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ extends:
5454

5555
- script: |
5656
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
57-
python ./pythonFiles/install_debugpy.py
58-
python ./pythonFiles/download_get_pip.py
57+
python ./python_files/install_debugpy.py
58+
python ./python_files/download_get_pip.py
5959
displayName: Install debugpy and get-pip.py
6060
6161
- script: |
62-
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./pythonFiles/lib/python --implementation py -r ./requirements.txt
62+
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt
6363
displayName: Install Python dependencies
6464
6565
- script: |
66-
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./pythonFiles/lib/jedilsp --implementation py --platform any --abi none -r ./pythonFiles/jedilsp_requirements/requirements.txt
66+
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/jedilsp --implementation py --platform any --abi none -r ./python_files/jedilsp_requirements/requirements.txt
6767
displayName: Install Jedi Language Server
6868
6969
- script: |

0 commit comments

Comments
 (0)