Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
# entry to lower the number of runners used, macOS runners are expensive,
# and we assume that Ubuntu is enough to cover the UNIX case.
os: [ubuntu-latest, windows-latest]
python: ['2.7', '3.x']
python: ['3.x']
test-suite: [ts-unit, python-unit, venv, single-workspace, multi-workspace, debugger, functional]
steps:
- name: Checkout
Expand Down Expand Up @@ -173,13 +173,7 @@ jobs:
python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
python ./pythonFiles/install_debugpy.py
shell: bash
if: matrix.test-suite == 'debugger' && matrix.python != 2.7

- name: Install debugpy wheel (Python 2.7)
run: |
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
shell: bash
if: matrix.test-suite == 'debugger' && matrix.python == 2.7
if: matrix.test-suite == 'debugger'

- name: Install functional test requirements
run: python -m pip install --upgrade -r ./build/functional-test-requirements.txt
Expand All @@ -190,7 +184,7 @@ jobs:
TEST_FILES_SUFFIX: testvirtualenvs
PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
shell: pwsh
if: matrix.test-suite == 'venv' && matrix.python != 2.7
if: matrix.test-suite == 'venv'
run: |
python -m pip install pipenv
python -m pipenv run python ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} pipenvPath
Expand Down
17 changes: 4 additions & 13 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,9 @@ jobs:
# macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
os: [ubuntu-latest, windows-latest]
# Run the tests on the oldest and most recent versions of Python.
python: ['2.7', '3.x']
python: ['3.x']
test-suite: [ts-unit, python-unit, venv, single-workspace, debugger, functional]
exclude:
# For fast PR turn-around, skip 2.7 under Windows.
- os: windows-latest
python: '2.7'

steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -152,13 +149,7 @@ jobs:
python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
python ./pythonFiles/install_debugpy.py
shell: bash
if: matrix.test-suite == 'debugger' && matrix.python != 2.7

- name: Install debugpy wheel (Python 2.7)
run: |
python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade --pre debugpy
shell: bash
if: matrix.test-suite == 'debugger' && matrix.python == 2.7
if: matrix.test-suite == 'debugger'

- name: Install functional test requirements
run: python -m pip install --upgrade -r ./build/functional-test-requirements.txt
Expand All @@ -169,7 +160,7 @@ jobs:
TEST_FILES_SUFFIX: testvirtualenvs
PYTHON_VIRTUAL_ENVS_LOCATION: './src/tmp/envPaths.json'
shell: pwsh
if: matrix.test-suite == 'venv' && matrix.python != 2.7
if: matrix.test-suite == 'venv'
run: |
python -m pip install pipenv
python -m pipenv run python ./build/ci/addEnvPath.py ${{ env.PYTHON_VIRTUAL_ENVS_LOCATION }} pipenvPath
Expand Down