@@ -40,30 +40,30 @@ jobs: |
40 | 40 | run: | |
41 | 41 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt |
42 | 42 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/old_ptvsd --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==4.3.2' |
43 | | - python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre ptvsd |
| 43 | + python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/debugpy/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy |
44 | 44 |
|
45 | | - - name: Install ptvsd wheels |
| 45 | + - name: Install debugpy wheels |
46 | 46 | run: | |
47 | 47 | python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt |
48 | | - python ./pythonFiles/install_ptvsd.py |
| 48 | + python ./pythonFiles/install_debugpy.py |
49 | 49 |
|
50 | | - # Retrieve the list of ptvsd versions from PyPI in order to increase the specificity of the pip cache key, |
| 50 | + # Retrieve the list of debugpy versions from PyPI in order to increase the specificity of the pip cache key, |
51 | 51 | # so that the cache gets invalidated as necessary. |
52 | 52 | # See https://github.com/microsoft/vscode-python/pull/9843#discussion_r373635221 |
53 | | - - name: curl PyPI to get ptvsd versions |
54 | | - run: curl --output ptvsd.json https://pypi.org/pypi/ptvsd/json |
| 53 | + - name: curl PyPI to get debugpy versions |
| 54 | + run: curl --output debugpy.json https://pypi.org/pypi/debugpy/json |
55 | 55 |
|
56 | 56 | - name: Cache pip files |
57 | 57 | uses: actions/cache@v1 |
58 | 58 | with: |
59 | 59 | path: ~/.cache/pip |
60 | | - key: ${{runner.os}}-${{env.CACHE_PIP_DEPS}}-pip-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}} |
| 60 | + key: ${{runner.os}}-${{env.CACHE_PIP_DEPS}}-pip-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}} |
61 | 61 |
|
62 | 62 | - name: Cache ./pythonFiles/lib/python |
63 | 63 | uses: actions/cache@v1 |
64 | 64 | with: |
65 | 65 | path: ./pythonFiles/lib/python |
66 | | - key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}} |
| 66 | + key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}} |
67 | 67 |
|
68 | 68 | js-ts-deps: |
69 | 69 | name: Install npm dependencies |
@@ -148,14 +148,14 @@ jobs: |
148 | 148 | path: ~/.npm |
149 | 149 | key: ${{runner.os}}-${{env.CACHE_NPM_DEPS}}-${{hashFiles('package-lock.json')}} |
150 | 150 |
|
151 | | - - name: curl PyPI to get ptvsd versions |
152 | | - run: curl --output ptvsd.json https://pypi.org/pypi/ptvsd/json |
| 151 | + - name: curl PyPI to get debugpy versions |
| 152 | + run: curl --output debugpy.json https://pypi.org/pypi/debugpy/json |
153 | 153 |
|
154 | 154 | - name: Retrieve cached pythonFiles/ directory |
155 | 155 | uses: actions/cache@v1 |
156 | 156 | with: |
157 | 157 | path: ./pythonFiles/lib/python |
158 | | - key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}} |
| 158 | + key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}} |
159 | 159 |
|
160 | 160 | - name: Install dependencies (npm ci) |
161 | 161 | run: npm ci --prefer-offline |
@@ -222,28 +222,28 @@ jobs: |
222 | 222 | with: |
223 | 223 | python-version: ${{matrix.python}} |
224 | 224 |
|
225 | | - - name: curl PyPI to get ptvsd versions |
226 | | - run: curl --output ptvsd.json https://pypi.org/pypi/ptvsd/json |
| 225 | + - name: curl PyPI to get debugpy versions |
| 226 | + run: curl --output debugpy.json https://pypi.org/pypi/debugpy/json |
227 | 227 |
|
228 | 228 | - name: Retrieve cached pythonFiles/ directory |
229 | 229 | uses: actions/cache@v1 |
230 | 230 | # Use an id for this step so that its cache-hit output can be accessed and checked in the next step. |
231 | 231 | id: pythonFiles-cache |
232 | 232 | with: |
233 | 233 | path: ./pythonFiles/lib/python |
234 | | - key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('ptvsd.json')}} |
| 234 | + key: ${{runner.os}}-${{env.CACHE_PYTHONFILES}}-pythonFiles-${{env.PYTHON_VERSION}}-${{hashFiles('requirements.txt')}}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('debugpy.json')}} |
235 | 235 |
|
236 | 236 | - name: Install Python requirements if not cached |
237 | 237 | run: | |
238 | 238 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r requirements.txt |
239 | 239 | python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/old_ptvsd --no-cache-dir --implementation py --no-deps --upgrade 'ptvsd==4.3.2' |
240 | | - python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/new_ptvsd/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre ptvsd |
| 240 | + python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python/debugpy/no_wheels --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy |
241 | 241 | if: steps.pythonFiles-cache.outputs.cache-hit == false |
242 | 242 |
|
243 | | - - name: Install ptvsd wheels if not cached |
| 243 | + - name: Install debugpy wheels if not cached |
244 | 244 | run: | |
245 | 245 | python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt |
246 | | - python ./pythonFiles/install_ptvsd.py |
| 246 | + python ./pythonFiles/install_debugpy.py |
247 | 247 | if: steps.pythonFiles-cache.outputs.cache-hit == false |
248 | 248 |
|
249 | 249 | - name: Install test requirements |
|