GeezerVison is showing github.com — Switch from jedils_requirements.txt to requirements.txt (#18243) · harupy/vscode-python@10bb8d0
File treeExpand file treeCollapse file tree Open diff view settings pythonFiles/jedilsp_requirements src/client/activation/jedi
Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: .github/actions/build-vsix/action.yml +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 30 | 30 | cache-dependency-path: | | 31 | 31 | requirements.txt | 32 | 32 | build/debugger-install-requirements.txt | 33 | | - jedils_requirements.txt | | 33 | + pythonFiles/jedilsp_requirements/requirements.txt | 34 | 34 |
| 35 | 35 | - name: Upgrade Pip | 36 | 36 | run: python -m pip install -U pip | | 53 | 53 |
| 54 | 54 | - name: Install Jedi LSP | 55 | 55 | run: | | 56 | | - python -m pip --disable-pip-version-check install --require-hashes -t ./pythonFiles/lib/jedilsp --implementation py --platform any --abi none --no-deps --only-binary :all: --upgrade -r jedils_requirements.txt | | 56 | + python -m pip --disable-pip-version-check install --require-hashes -t ./pythonFiles/lib/jedilsp --implementation py --platform any --abi none --no-deps --only-binary :all: --upgrade -r ./pythonFiles/jedilsp_requirements/requirements.txt | 57 | 57 | shell: bash | 58 | 58 |
| 59 | 59 | - name: Run npm ci | |
Collapse file Copy file name to clipboardExpand all lines: .github/workflows/build.yml +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -119,7 +119,7 @@ jobs: | 119 | 119 | - name: Install Python 3 requirements | 120 | 120 | run: | | 121 | 121 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt | 122 | | - python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt | | 122 | + python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./pythonFiles/jedilsp_requirements/requirements.txt | 123 | 123 | if: startsWith(matrix.python, 3.) | 124 | 124 |
| 125 | 125 | - name: Install test requirements | |
Collapse file Copy file name to clipboardExpand all lines: .github/workflows/pr-check.yml +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 99 | 99 | - name: Install Python 3 requirements | 100 | 100 | run: | | 101 | 101 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt --no-user | 102 | | - python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt | | 102 | + python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./pythonFiles/jedilsp_requirements/requirements.txt | 103 | 103 | if: startsWith(matrix.python, 3.) | 104 | 104 |
| 105 | 105 | - name: Install test requirements | @@ -378,7 +378,7 @@ jobs: | 378 | 378 | cache: 'pip' | 379 | 379 | cache-dependency-path: | | 380 | 380 | requirements.txt | 381 | | - jedils_requirements.txt | | 381 | + pythonFiles/jedilsp_requirements/requirements.txt | 382 | 382 | build/test-requirements.txt | 383 | 383 | build/functional-test-requirements.txt | 384 | 384 |
| @@ -387,7 +387,7 @@ jobs: | 387 | 387 | python -m pip --disable-pip-version-check install --require-hashes -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade -r requirements.txt --no-user | 388 | 388 | # 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. | 389 | 389 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade --pre debugpy | 390 | | - python -m pip --disable-pip-version-check install --require-hashes -t ./pythonFiles/lib/jedilsp --implementation py --no-deps --upgrade -r ./jedils_requirements.txt | | 390 | + python -m pip --disable-pip-version-check install --require-hashes -t ./pythonFiles/lib/jedilsp --implementation py --no-deps --upgrade -r ./pythonFiles/jedilsp_requirements/requirements.txt | 391 | 391 |
| 392 | 392 | - name: Install test requirements | 393 | 393 | run: python -m pip install --upgrade -r build/test-requirements.txt | |
Collapse file Copy file name to clipboardExpand all lines: .vscodeignore +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -60,6 +60,7 @@ pythonFiles/**/*.pyc | 60 | 60 | pythonFiles/lib/**/*.dist-info/** | 61 | 61 | pythonFiles/lib/**/*.egg-info/** | 62 | 62 | pythonFiles/lib/python/bin/** | | 63 | +pythonFiles/jedilsp_requirements/** | 63 | 64 | pythonFiles/tests/** | 64 | 65 | scripts/** | 65 | 66 | src/** | |
Collapse file Copy file name to clipboardExpand all lines: gulpfile.js +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -265,7 +265,7 @@ gulp.task('installPythonRequirements', async () => { | 265 | 265 | '--no-deps', | 266 | 266 | '--upgrade', | 267 | 267 | '-r', | 268 | | - './jedils_requirements.txt', | | 268 | + './pythonFiles/jedilsp_requirements/requirements.txt', | 269 | 269 | ]; | 270 | 270 | success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true) | 271 | 271 | .then(() => true) | |
Collapse file Copy file name to clipboard +1Lines changed: 1 addition & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
| | 1 | +Switch `jedils_requirements.txt` to `requirements.txt` under `pythonFiles/jedilsp_requirements/`. |
Collapse file Copy file name to clipboardExpand all lines: pythonFiles/jedilsp_requirements/requirements.in +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 2 | 2 | # To update requirements.txt, run the following commands. | 3 | 3 | # Use Python 3.6 when creating the environment or using pip-tools | 4 | 4 | # 1) pip install pip-tools | 5 | | -# 2) pip-compile --generate-hashes --upgrade jedils_requirements.in | | 5 | +# 2) pip-compile --generate-hashes --upgrade pythonFiles\jedilsp_requirements\requirements.in | 6 | 6 |
| 7 | 7 | # We don't need to add Python version restrictions | 8 | 8 | # since we don't support anything older than 3.6 anymore, | |
Collapse file Copy file name to clipboardExpand all lines: pythonFiles/jedilsp_requirements/requirements.txt +4-4Lines changed: 4 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 2 | 2 | # This file is autogenerated by pip-compile with python 3.6 | 3 | 3 | # To update, run: | 4 | 4 | # | 5 | | -# pip-compile --generate-hashes jedils_requirements.in | | 5 | +# pip-compile --generate-hashes 'pythonFiles\jedilsp_requirements\requirements.in' | 6 | 6 | # | 7 | 7 | dataclasses==0.8 ; python_version <= "3.6" \ | 8 | 8 | --hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \ | 9 | 9 | --hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97 | 10 | 10 | # via | 11 | | - # -r jedils_requirements.in | | 11 | + # -r pythonFiles\jedilsp_requirements\requirements.in | 12 | 12 | # pydantic | 13 | 13 | docstring-to-markdown==0.10 \ | 14 | 14 | --hash=sha256:12f75b0c7b7572defea2d9e24b57ef7ac38c3e26e91c0e5547cfc02b1c168bf6 \ | @@ -25,7 +25,7 @@ jedi==0.18.0 \ | 25 | 25 | jedi-language-server==0.34.12 \ | 26 | 26 | --hash=sha256:a6d272fa82f47407f1bcb8f4ee5d105a2bec450010af2eb60570b0d563d416eb \ | 27 | 27 | --hash=sha256:e1194e793d2d7af3dcb1c2b9b7ed6e974eefdd64b1934a30e2043d21cba7aafe | 28 | | - # via -r jedils_requirements.in | | 28 | + # via -r pythonFiles\jedilsp_requirements\requirements.in | 29 | 29 | parso==0.8.3 \ | 30 | 30 | --hash=sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0 \ | 31 | 31 | --hash=sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75 | @@ -60,7 +60,7 @@ pygls==0.11.3 \ | 60 | 60 | --hash=sha256:4d86fc854e6d6613cd42bf7511e9c6aac947fc8d62ff973a705570b036d969f2 \ | 61 | 61 | --hash=sha256:5c925b182f2b0aa38d0ce83a9829ca5aed8eb9c7079cffc5bddff2da1033b58f | 62 | 62 | # via | 63 | | - # -r jedils_requirements.in | | 63 | + # -r pythonFiles\jedilsp_requirements\requirements.in | 64 | 64 | # jedi-language-server | 65 | 65 | typeguard==2.13.2 \ | 66 | 66 | --hash=sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf \ | |
Collapse file Copy file name to clipboardExpand all lines: src/client/activation/jedi/manager.ts +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -87,7 +87,7 @@ export class JediLanguageServerManager implements ILanguageServerManager { | 87 | 87 | try { | 88 | 88 | // Version is actually hardcoded in our requirements.txt. | 89 | 89 | const requirementsTxt = await fs.readFile( | 90 | | - path.join(EXTENSION_ROOT_DIR, 'jedils_requirements.txt'), | | 90 | + path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'jedilsp_requirements', 'requirements.txt'), | 91 | 91 | 'utf-8', | 92 | 92 | ); | 93 | 93 |
| |
|