Skip to content

Commit

Permalink
Rename pythonFiles to python_files (#22921)
Browse files Browse the repository at this point in the history
  • Loading branch information
karthiknadig authored Mar 1, 2024
1 parent c330ff9 commit 27783ce
Show file tree
Hide file tree
Showing 337 changed files with 140 additions and 2,704 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ src/test/common/process/proc.unit.test.ts
src/test/common/interpreterPathService.unit.test.ts


src/test/pythonFiles/formatting/dummy.ts
src/test/python_files/formatting/dummy.ts

src/test/debugger/extension/adapter/adapter.test.ts
src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts
Expand Down
12 changes: 6 additions & 6 deletions .github/actions/build-vsix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
cache-dependency-path: |
requirements.txt
build/build-install-requirements.txt
pythonFiles/jedilsp_requirements/requirements.txt
python_files/jedilsp_requirements/requirements.txt
- name: Upgrade Pip
run: python -m pip install -U pip
Expand All @@ -44,20 +44,20 @@ runs:
- name: Install Python dependencies
uses: brettcannon/pip-secure-install@v1
with:
options: '-t ./pythonFiles/lib/python --implementation py'
options: '-t ./python_files/lib/python --implementation py'

- name: Install debugpy and get-pip
run: |
python -m pip --disable-pip-version-check install packaging
python ./pythonFiles/install_debugpy.py
python ./pythonFiles/download_get_pip.py
python ./python_files/install_debugpy.py
python ./python_files/download_get_pip.py
shell: bash

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

- name: Run npm ci
run: npm ci --prefer-offline
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/lint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ runs:
run: |
python -m pip install -U black
python -m black . --check
working-directory: pythonFiles
working-directory: python_files
shell: bash

- name: Run Ruff
run: |
python -m pip install -U ruff
python -m ruff check .
working-directory: pythonFiles
working-directory: python_files
shell: bash
4 changes: 2 additions & 2 deletions .github/actions/smoke-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ runs:
- name: Install Python requirements
uses: brettcannon/pip-secure-install@v1
with:
options: '-t ./pythonFiles/lib/python --implementation py'
options: '-t ./python_files/lib/python --implementation py'

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

# Bits from the VSIX are reused by smokeTest.ts to speed things up.
Expand Down
2 changes: 1 addition & 1 deletion .github/release_plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ NOTE: the number of this release is in the issue title and can be substituted in
- [ ] Create a new branch called **`bump-release-[YYYY.minor]`**.
- [ ] Change the version in `package.json` to the next **even** number and switch the `-dev` to `-rc`. (🤖)
- [ ] 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**)_. (🤖)
- [ ] 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.
- [ ] 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.
- [ ] 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.
- [ ] 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.

Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,24 @@ jobs:
- name: Install core Python requirements
uses: brettcannon/pip-secure-install@v1
with:
options: '-t ./pythonFiles/lib/python --no-cache-dir --implementation py'
options: '-t ./python_files/lib/python --no-cache-dir --implementation py'

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

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

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

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

- name: Run Python unit tests
run: python pythonFiles/tests/run_all.py
run: python python_files/tests/run_all.py

tests:
name: Tests
Expand Down Expand Up @@ -192,26 +192,26 @@ jobs:
run: |
python -m pip install wheel
python -m pip install -r build/build-install-requirements.txt
python ./pythonFiles/download_get_pip.py
python ./python_files/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.
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
- name: Install core Python requirements
uses: brettcannon/pip-secure-install@v1
with:
requirements-file: '"${{ env.special-working-directory-relative }}/requirements.txt"'
options: '-t "${{ env.special-working-directory-relative }}/pythonFiles/lib/python" --no-cache-dir --implementation py'
options: '-t "${{ env.special-working-directory-relative }}/python_files/lib/python" --no-cache-dir --implementation py'
if: startsWith(matrix.python, 3.)

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

- name: Install test requirements
Expand All @@ -221,7 +221,7 @@ jobs:
run: |
python -m pip install wheel
python -m pip install -r build/build-install-requirements.txt
python ./pythonFiles/install_debugpy.py
python ./python_files/install_debugpy.py
shell: bash
if: matrix.test-suite == 'debugger'

Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,24 @@ jobs:
- name: Install base Python requirements
uses: brettcannon/pip-secure-install@v1
with:
options: '-t ./pythonFiles/lib/python --no-cache-dir --implementation py'
options: '-t ./python_files/lib/python --no-cache-dir --implementation py'

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

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

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

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

- name: Run Python unit tests
run: python pythonFiles/tests/run_all.py
run: python python_files/tests/run_all.py

tests:
name: Tests
Expand Down Expand Up @@ -179,26 +179,26 @@ jobs:
- 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.
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
- 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
python ./python_files/download_get_pip.py
shell: bash

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

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

- name: Install test requirements
run: python -m pip install --upgrade -r build/test-requirements.txt
Expand All @@ -207,7 +207,7 @@ jobs:
run: |
python -m pip install wheel
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
python ./pythonFiles/install_debugpy.py
python ./python_files/install_debugpy.py
shell: bash
if: matrix.test-suite == 'debugger'

Expand Down Expand Up @@ -393,25 +393,25 @@ jobs:
cache: 'pip'
cache-dependency-path: |
requirements.txt
pythonFiles/jedilsp_requirements/requirements.txt
python_files/jedilsp_requirements/requirements.txt
build/test-requirements.txt
build/functional-test-requirements.txt
- name: Install base Python requirements
uses: brettcannon/pip-secure-install@v1
with:
options: '-t ./pythonFiles/lib/python --implementation py'
options: '-t ./python_files/lib/python --implementation py'

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

- 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.
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy
python -m pip --disable-pip-version-check install -t ./python_files/lib/python --implementation py --no-deps --upgrade --pre debugpy
- name: Install test requirements
run: python -m pip install --upgrade -r build/test-requirements.txt
Expand Down Expand Up @@ -487,7 +487,7 @@ jobs:

- name: Run Python unit tests
run: |
python pythonFiles/tests/run_all.py
python python_files/tests/run_all.py
# The virtual environment based tests use the `testSingleWorkspace` set of tests
# with the environment variable `TEST_FILES_SUFFIX` set to `testvirtualenvs`,
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ cucumber-report.json
**/.venv*/
port.txt
precommit.hook
pythonFiles/lib/**
pythonFiles/get-pip.py
python_files/lib/**
python_files/get-pip.py
debug_coverage*/**
languageServer/**
languageServer.*/**
Expand Down
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,18 +249,18 @@
},
{
"name": "Listen",
"type": "python",
"type": "debugpy",
"request": "attach",
"listen": { "host": "localhost", "port": 5678 },
"justMyCode": true
},
{
"name": "Debug pytest plugin tests",

"type": "python",
"type": "debugpy",
"request": "launch",
"module": "pytest",
"args": ["${workspaceFolder}/pythonFiles/tests/pytestadapter"],
"args": ["${workspaceFolder}/python_files/tests/pytestadapter"],
"justMyCode": true
}
],
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
// Open merge editor for resolving conflicts.
"git.mergeEditor": true,
"python.testing.pytestArgs": [
"pythonFiles/tests"
"python_files/tests"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
Expand Down
12 changes: 6 additions & 6 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ obj/**
out/**/*.stats.json
out/client/**/*.analyzer.html
out/coverconfig.json
out/pythonFiles/**
out/python_files/**
out/src/**
out/test/**
out/testMultiRootWkspc/**
precommit.hook
pythonFiles/**/*.pyc
pythonFiles/lib/**/*.egg-info/**
pythonFiles/lib/python/bin/**
pythonFiles/jedilsp_requirements/**
pythonFiles/tests/**
python_files/**/*.pyc
python_files/lib/**/*.egg-info/**
python_files/lib/python/bin/**
python_files/jedilsp_requirements/**
python_files/tests/**
scripts/**
src/**
test/**
Expand Down
8 changes: 4 additions & 4 deletions build/azure-pipeline.pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ extends:

- script: |
python -m pip --disable-pip-version-check install -r build/build-install-requirements.txt
python ./pythonFiles/install_debugpy.py
python ./pythonFiles/download_get_pip.py
python ./python_files/install_debugpy.py
python ./python_files/download_get_pip.py
displayName: Install debugpy and get-pip.py
- script: |
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./pythonFiles/lib/python --implementation py -r ./requirements.txt
python -m pip install --no-deps --require-hashes --only-binary :all: -t ./python_files/lib/python --implementation py -r ./requirements.txt
displayName: Install Python dependencies
- script: |
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
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
displayName: Install Jedi Language Server
- script: |
Expand Down
Loading

0 comments on commit 27783ce

Please sign in to comment.