Skip to content

ci: Use python 3.12 by default #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
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
4 changes: 2 additions & 2 deletions .github/workflows/e2e-nvidia-l4-x1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
run: |
cat /etc/os-release
mkdir -p "${TMPDIR}"
sudo dnf install -y gcc gcc-c++ make git python3.11 python3.11-devel
sudo dnf install -y gcc gcc-c++ make git python3.12 python3.12-devel

- name: Checkout instructlab/instructlab
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Install ilab
working-directory: ./instructlab
run: |
PYTHON=python3.11 ./scripts/install-ilab-with-cuda.sh
PYTHON=python3.12 ./scripts/install-ilab-with-cuda.sh

- name: Update instructlab-eval library
working-directory: ./eval
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-nvidia-l40s-x4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
run: |
cat /etc/os-release
mkdir -p "${TMPDIR}"
sudo dnf install -y gcc gcc-c++ make git python3.11 python3.11-devel
sudo dnf install -y gcc gcc-c++ make git python3.12 python3.12-devel

- name: Checkout instructlab/instructlab
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
- name: Install ilab
working-directory: ./instructlab
run: |
PYTHON=python3.11 ./scripts/install-ilab-with-cuda.sh
PYTHON=python3.12 ./scripts/install-ilab-with-cuda.sh

- name: Update instructlab-eval library
working-directory: ./eval
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
- name: Free disk space
uses: ./.github/actions/free-disk-space

- name: Setup Python 3.11
- name: Setup Python 3.12
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
with:
python-version: 3.11
python-version: 3.12
cache: pip
cache-dependency-path: |
**/pyproject.toml
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,11 @@ jobs:
matrix:
python:
- "3.11"
- "3.12"
platform:
- "ubuntu-latest"
include:
- python: "3.11"
- python: "3.12"
platform: "macos-latest"
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ A teacher model is used to generate new multiple choice questions based on the k
The following tools are required:

- [`git`](https://git-scm.com)
- [`python`](https://www.python.org) (v3.11)
- [`python`](https://www.python.org) (v3.12)
- [`pip`](https://pypi.org/project/pip/) (v23.0+)
- [`bash`](https://www.gnu.org/software/bash/) (v5+, for functional tests)

Expand Down
4 changes: 2 additions & 2 deletions docs/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ All unit tests currently live in the `tests/` directory and are run with [pytest

To run the unit tests, you can run `tox -e unit` or `tox -e unitcov` if you want to generate coverage metrics as well.

In CI, the tests are run with Python 3.11 on Ubuntu and MacOS runners - you can see the details [here](https://github.com/instructlab/eval/blob/main/.github/workflows/test.yml)
In CI, the tests are run with on Ubuntu and MacOS runners - you can see the details [here](https://github.com/instructlab/eval/blob/main/.github/workflows/test.yml)

## Functional tests

Expand All @@ -20,7 +20,7 @@ The functional test script is Shell-based and can be found at `scripts/functiona

To run the functional tests, you can run `tox -e functional`.

In CI, the tests are run with Python 3.11 on Ubuntu and MacOS runners - you can see the details [here](https://github.com/instructlab/eval/blob/main/.github/workflows/test.yml)
In CI, the tests are run on Ubuntu and MacOS runners - you can see the details [here](https://github.com/instructlab/eval/blob/main/.github/workflows/test.yml)

## End-to-end (E2E) tests

Expand Down
9 changes: 7 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[tox]
# py3-unit runs unit tests with 'python3'
# py311-unit runs the same tests with 'python3.11'
# py312-unit runs the same tests with 'python3.12'
envlist = ruff, lint, mypy, py3-{unit, functional}
minversion = 4.4

Expand Down Expand Up @@ -82,7 +82,7 @@ commands =
mypy src

[testenv:py3]
basepython = python3.11
basepython = python3.12

[testenv:py3-unit]
basepython = {[testenv:py3]basepython}
Expand All @@ -96,6 +96,11 @@ passenv =
[gh]
python =
3.11 = py311-{unitcov, functional}
3.12 = py312-{unitcov, functional}
3.13 = py313-{unitcov, functional}
3.14 = py314-{unitcov, functional}
3.15 = py315-{unitcov, functional}
3.16 = py316-{unitcov, functional}

[testenv:constraints]
description = Generate new constraints file(s)
Expand Down