Switch from jedils_requirements.txt to requirements.txt (#18243)

* Switch from jedils_requirements.txt to requirements.txt

* add news item

Author: karthiknadig

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

@@ -30,7 +30,7 @@ runs:
         cache-dependency-path: |
           requirements.txt
           build/debugger-install-requirements.txt
-          jedils_requirements.txt
+          pythonFiles/jedilsp_requirements/requirements.txt
 
     - name: Upgrade Pip
       run: python -m pip install -U pip
@@ -53,7 +53,7 @@ runs:
 
     - name: Install Jedi LSP
       run: |
-        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
+        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
       shell: bash
 
     - name: Run npm ci

.github/workflows/build.yml

@@ -119,7 +119,7 @@ jobs:
       - name: Install Python 3 requirements
         run: |
           python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt
+          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
         if: startsWith(matrix.python, 3.)
 
       - name: Install test requirements

.github/workflows/pr-check.yml

@@ -99,7 +99,7 @@ jobs:
       - name: Install Python 3 requirements
         run: |
           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
-          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/jedilsp --no-cache-dir --implementation py --no-deps --upgrade -r ./jedils_requirements.txt
+          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
         if: startsWith(matrix.python, 3.)
 
       - name: Install test requirements
@@ -378,7 +378,7 @@ jobs:
           cache: 'pip'
           cache-dependency-path: |
             requirements.txt
-            jedils_requirements.txt
+            pythonFiles/jedilsp_requirements/requirements.txt
             build/test-requirements.txt
             build/functional-test-requirements.txt
 
@@ -387,7 +387,7 @@ jobs:
           python -m pip --disable-pip-version-check install --require-hashes -t ./pythonFiles/lib/python --implementation py --no-deps --upgrade -r requirements.txt --no-user
           # 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 --require-hashes -t ./pythonFiles/lib/jedilsp --implementation py --no-deps --upgrade -r ./jedils_requirements.txt
+          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
 
       - name: Install test requirements
         run: python -m pip install --upgrade -r build/test-requirements.txt

.vscodeignore

@@ -60,6 +60,7 @@ pythonFiles/**/*.pyc
 pythonFiles/lib/**/*.dist-info/**
 pythonFiles/lib/**/*.egg-info/**
 pythonFiles/lib/python/bin/**
+pythonFiles/jedilsp_requirements/**
 pythonFiles/tests/**
 scripts/**
 src/**

gulpfile.js

@@ -265,7 +265,7 @@ gulp.task('installPythonRequirements', async () => {
         '--no-deps',
         '--upgrade',
         '-r',
-        './jedils_requirements.txt',
+        './pythonFiles/jedilsp_requirements/requirements.txt',
     ];
     success = await spawnAsync(process.env.CI_PYTHON_PATH || 'python3', args, undefined, true)
         .then(() => true)

news/3 Code Health/18185.md

@@ -0,0 +1 @@
+Switch `jedils_requirements.txt` to `requirements.txt` under `pythonFiles/jedilsp_requirements/`.

jedils_requirements.in …les/jedilsp_requirements/requirements.injedils_requirements.in renamed to pythonFiles/jedilsp_requirements/requirements.in jedils_requirements.in renamed to pythonFiles/jedilsp_requirements/requirements.in

@@ -2,7 +2,7 @@
 # To update requirements.txt, run the following commands.
 # Use Python 3.6 when creating the environment or using pip-tools
 # 1) pip install pip-tools
-# 2) pip-compile --generate-hashes --upgrade jedils_requirements.in
+# 2) pip-compile --generate-hashes --upgrade pythonFiles\jedilsp_requirements\requirements.in
 
 # We don't need to add Python version restrictions
 # since we don't support anything older than 3.6 anymore,

jedils_requirements.txt …es/jedilsp_requirements/requirements.txtjedils_requirements.txt renamed to pythonFiles/jedilsp_requirements/requirements.txt jedils_requirements.txt renamed to pythonFiles/jedilsp_requirements/requirements.txt

@@ -2,13 +2,13 @@
 # This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
-#    pip-compile --generate-hashes jedils_requirements.in
+#    pip-compile --generate-hashes 'pythonFiles\jedilsp_requirements\requirements.in'
 #
 dataclasses==0.8 ; python_version <= "3.6" \
     --hash=sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf \
     --hash=sha256:8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97
     # via
-    #   -r jedils_requirements.in
+    #   -r pythonFiles\jedilsp_requirements\requirements.in
     #   pydantic
 docstring-to-markdown==0.10 \
     --hash=sha256:12f75b0c7b7572defea2d9e24b57ef7ac38c3e26e91c0e5547cfc02b1c168bf6 \
@@ -25,7 +25,7 @@ jedi==0.18.0 \
 jedi-language-server==0.34.12 \
     --hash=sha256:a6d272fa82f47407f1bcb8f4ee5d105a2bec450010af2eb60570b0d563d416eb \
     --hash=sha256:e1194e793d2d7af3dcb1c2b9b7ed6e974eefdd64b1934a30e2043d21cba7aafe
-    # via -r jedils_requirements.in
+    # via -r pythonFiles\jedilsp_requirements\requirements.in
 parso==0.8.3 \
     --hash=sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0 \
     --hash=sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75
@@ -60,7 +60,7 @@ pygls==0.11.3 \
     --hash=sha256:4d86fc854e6d6613cd42bf7511e9c6aac947fc8d62ff973a705570b036d969f2 \
     --hash=sha256:5c925b182f2b0aa38d0ce83a9829ca5aed8eb9c7079cffc5bddff2da1033b58f
     # via
-    #   -r jedils_requirements.in
+    #   -r pythonFiles\jedilsp_requirements\requirements.in
     #   jedi-language-server
 typeguard==2.13.2 \
     --hash=sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf \

src/client/activation/jedi/manager.ts

@@ -87,7 +87,7 @@ export class JediLanguageServerManager implements ILanguageServerManager {
         try {
             // Version is actually hardcoded in our requirements.txt.
             const requirementsTxt = await fs.readFile(
-                path.join(EXTENSION_ROOT_DIR, 'jedils_requirements.txt'),
+                path.join(EXTENSION_ROOT_DIR, 'pythonFiles', 'jedilsp_requirements', 'requirements.txt'),
                 'utf-8',
             );