Skip to content

Commit 56c9923

Browse files
Update nox and pipelines
1 parent 149c93e commit 56c9923

File tree

7 files changed

+26
-19
lines changed

7 files changed

+26
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ runs:
3939
shell: bash
4040

4141
- name: Install bundled python libraries
42-
run: pipx run nox --session install_bundled_libs
42+
run: pipx run nox --session install_old_bundled_libs
4343
shell: bash
4444

4545
# Use the GITHUB_RUN_ID environment variable to update the build number.

.github/actions/lint/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
- name: Install Python
3131
uses: actions/setup-python@v4
3232
with:
33-
python-version: '3.7'
33+
python-version: '3.6'
3434

3535
- name: Pip cache
3636
uses: actions/cache@v3
@@ -47,7 +47,7 @@ runs:
4747

4848
# This will install libraries to a target directory.
4949
- name: Install bundled python libraries
50-
run: pipx run nox --session install_bundled_libs
50+
run: pipx run nox --session install_old_bundled_libs
5151
shell: bash
5252

5353
- name: Check linting and formatting

.github/workflows/pr-check.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
os: [ubuntu-latest, windows-latest]
48-
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
48+
python: ['3.6']
4949

5050
steps:
5151
- name: Checkout
5252
uses: actions/checkout@v3
5353
with:
5454
path: ${{ env.special-working-directory-relative }}
5555

56-
# Install bundled libs using 3.7 even though you test it on other versions.
57-
- name: Use Python 3.7
56+
# Install bundled libs using 3.6 even though you test it on other versions.
57+
- name: Use Python 3.6
5858
uses: actions/setup-python@v4
5959
with:
60-
python-version: '3.7'
60+
python-version: '3.6'
6161

6262
- name: Update pip, install pipx and install wheel
6363
run: python -m pip install -U pip pipx wheel
6464
shell: bash
6565

6666
# This will install libraries to a target directory.
6767
- name: Install bundled python libraries
68-
run: pipx run nox --session install_bundled_libs
68+
run: pipx run nox --session install_old_bundled_libs
6969
shell: bash
7070

7171
- name: Install Node

.github/workflows/push-check.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,27 @@ jobs:
5050
fail-fast: false
5151
matrix:
5252
os: [ubuntu-latest, windows-latest]
53-
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
53+
python: ['3.6']
5454

5555
steps:
5656
- name: Checkout
5757
uses: actions/checkout@v3
5858
with:
5959
path: ${{ env.special-working-directory-relative }}
6060

61-
# Install bundled libs using 3.7 even though you test it on other versions.
62-
- name: Use Python 3.7
61+
# Install bundled libs using 3.6 even though you test it on other versions.
62+
- name: Use Python 3.6
6363
uses: actions/setup-python@v4
6464
with:
65-
python-version: '3.7'
65+
python-version: '3.6'
6666

6767
- name: Update pip, install pipx and install wheel
6868
run: python -m pip install -U pip pipx wheel
6969
shell: bash
7070

7171
# This will install libraries to a target directory.
7272
- name: Install bundled python libraries
73-
run: pipx run nox --session install_bundled_libs
73+
run: pipx run nox --session install_old_bundled_libs
7474
shell: bash
7575

7676
- name: Install Node

build/azure-pipeline.pre-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extends:
3636

3737
- task: UsePythonVersion@0
3838
inputs:
39-
versionSpec: '3.7'
39+
versionSpec: '3.6'
4040
addToPath: true
4141
architecture: 'x64'
4242
displayName: Select Python version
@@ -53,7 +53,7 @@ extends:
5353
- script: python -m pip install nox
5454
displayName: Install wheel
5555

56-
- script: python -m nox --session install_bundled_libs
56+
- script: python -m nox --session install_old_bundled_libs
5757
displayName: Install Python dependencies
5858

5959
- script: python ./build/update_ext_version.py --for-publishing

build/azure-pipeline.stable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extends:
3333

3434
- task: UsePythonVersion@0
3535
inputs:
36-
versionSpec: '3.7'
36+
versionSpec: '3.6'
3737
addToPath: true
3838
architecture: 'x64'
3939
displayName: Select Python version
@@ -50,7 +50,7 @@ extends:
5050
- script: python -m pip install nox
5151
displayName: Install wheel
5252

53-
- script: python -m nox --session install_bundled_libs
53+
- script: python -m nox --session install_old_bundled_libs
5454
displayName: Install Python dependencies
5555

5656
- script: python ./build/update_ext_version.py --release --for-publishing

noxfile.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import nox # pylint: disable=import-error
1313

1414

15-
def _install_bundle(session: nox.Session) -> None:
15+
def _install_bundle(session: nox.Session, version="latest") -> None:
1616
session.install(
1717
"-t",
1818
"./bundled/libs",
@@ -25,7 +25,7 @@ def _install_bundle(session: nox.Session) -> None:
2525
"./requirements.txt",
2626
)
2727
session.install("packaging")
28-
_install_package(f"{os.getcwd()}/bundled/libs", "debugpy", "1.5.1")
28+
_install_package(f"{os.getcwd()}/bundled/libs", "debugpy", version)
2929

3030

3131
def _update_pip_packages(session: nox.Session) -> None:
@@ -117,6 +117,13 @@ def install_bundled_libs(session):
117117
_install_bundle(session)
118118

119119

120+
@nox.session(python="3.6")
121+
def install_old_bundled_libs(session):
122+
"""Installs the libraries that will be bundled with the extension."""
123+
session.install("wheel")
124+
_install_bundle(session, "1.5.1")
125+
126+
120127
@nox.session(python="3.7")
121128
def setup(session: nox.Session) -> None:
122129
"""Sets up the extension for development."""

0 commit comments

Comments
 (0)