Fix various issues with tox and tests #1526
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bjhargrave
reviewed
Jun 29, 2024
Contributor
bjhargrave
left a comment
There was a problem hiding this comment.
This change does not seem to result in tox actually running the unit tests.
See https://github.com/instructlab/instructlab/actions/runs/9723803470/job/26839329939#step:12:27 for no output from the test execution.
5 tasks
`tox -e py3-unit` or `make tests` no longer works when the default Python interpreter is 3.12. InstructLab currently requires Python 3.10 or 3.11. All tox environments without a fully qualified Python version prefix now enforce Python 3.11 as default `basepython`. We cannot set `basepython = python3.11` in `[testenv]`, because that breaks `[testenv:py310]` enviroments. The `[testenv:py3-*]` also enforce Python 3.11 as `basepython`. `tox` no longer uses `requirements-dev.txt`. The requirements file installs additional packages that are not needed for testing, e.g. tox within tox. It also pulls in all dependencies from `requirements.txt`. We want to verify that `pip install instructlab` installs all dependencies automatically. Other changes and improvements: - run `mypy` with `make tests` instead of `make verify`. The verify target is for fast local testing without installing Torch stack. - use a tox label to run all fast verify targets - update Ruff to 0.5.0 - drop `ruff.sh` and use two separate targest for ruff checking and ruff fixing. Ruff and isort don't need much time and disk space to install. Signed-off-by: Christian Heimes <[email protected]>
bjhargrave
reviewed
Jul 2, 2024
bjhargrave
approved these changes
Jul 2, 2024
russellb
approved these changes
Jul 3, 2024
booxter
reviewed
Jul 17, 2024
| PIP_EXTRA_INDEX_URL=https://download.pytorch.org/whl/cpu | ||
| CMAKE_ARGS={env:CMAKE_ARGS:-DLLAMA_NATIVE=off} | ||
| package = wheel | ||
| wheel_build_env = pkg |
Contributor
There was a problem hiding this comment.
@tiran I've noticed that pkg environment is built using python3.12. I am not sure it's an actual issue. (For what I observe, tests still pass.)
$ .tox/pkg/bin/python --version
Python 3.12.3
The following change seems to switch to 3.11:
--- a/tox.ini
+++ b/tox.ini
@@ -34,6 +34,9 @@ allowlist_externals =
[testenv:py3]
basepython = python3.11
+[testenv:pkg]
+basepython = {[testenv:py3]basepython}
+
[testenv:py3-unit]
basepython = {[testenv:py3]basepython}
Since you are clearly more knowledgeable about packaging / tox, I'd like to ask: do you anticipate any problems with us using py3.12 for wheel build environment? Or it's a non-issue?
mergify bot
added a commit
that referenced
this pull request
Feb 26, 2025
PR #1526 moved this to a `tox` target. Approved-by: booxter Approved-by: courtneypacheco
mergify bot
added a commit
that referenced
this pull request
Feb 26, 2025
PR #1526 moved this to a `tox` target.<hr>This is an automatic backport of pull request #3188 done by [Mergify](https://mergify.com). Approved-by: ktdreyer Approved-by: courtneypacheco
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
tox -e py3-unitormake testsno longer works when the default Python interpreter is 3.12. InstructLab currently requires Python 3.10 or 3.11. All tox environments without a fully qualified Python version prefix now enforce Python 3.11 as defaultbasepython. We cannot setbasepython = python3.11in[testenv], because that breaks[testenv:py310]enviroments. The[testenv:py3-*]also enforce Python 3.11 asbasepython.toxno longer usesrequirements-dev.txt. The requirements file installs additional packages that are not needed for testing, e.g. tox within tox. It also pulls in all dependencies fromrequirements.txt. We want to verify thatpip install instructlabinstalls all dependencies automatically.Other changes and improvements:
mypywithmake testsinstead ofmake verify. The verify target is for fast local testing without installing Torch stack.ruff.shand use two separate targest for ruff checking and ruff fixing. Ruff and isort don't need much time and disk space to install.Checklist:
conventional commits.