Skip to content

Update python tester to allow a requirements file #580

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.

Sign up for GitHub

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

Merged
david-yz-liu merged 5 commits into from
Jan 16, 2025
Merged

Update python tester to allow a requirements file #580

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2f387e
update python tester to allow a requirements file
rickychen180 Jan 13, 2025
6359084
update changelog
rickychen180 Jan 13, 2025
01c0feb
combine pip installs together
rickychen180 Jan 13, 2025
5e599c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 14, 2025
5c71f22
Add pip requirements file field for jupyter and pyta autotesters
rickychen180 Jan 16, 2025
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
1 change: 1 addition & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
All notable changes to this project will be documented here.

## [unreleased]
- Update python tester to allow a requirements file (#580)

## [v2.6.0]
- Update python versions in docker file (#568)
Expand Down
4 changes: 4 additions & 0 deletions server/autotest_server/testers/py/settings_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
"pip_requirements": {
"title": "Package requirements",
"type": "string"
},
"pip_requirements_file": {
"title": "Package requirements file",
"type": "string"
}
}
},
Expand Down
6 changes: 5 additions & 1 deletion server/autotest_server/testers/py/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ def create_environment(settings_, env_dir, _default_env_dir):
requirements = os.path.join(os.path.dirname(os.path.realpath(__file__)), "requirements.txt")
pip = os.path.join(env_dir, "bin", "pip")
subprocess.run([f"python{python_version}", "-m", "venv", "--clear", env_dir], check=True)
subprocess.run([pip, "install", "-r", requirements, *pip_requirements], check=True)
pip_install_command = [pip, "install", "-r", requirements, *pip_requirements]
if env_data.get("pip_requirements_file"):
pip_install_command.append("-r")
pip_install_command.append(os.path.join(env_dir, "../", "files", env_data.get("pip_requirements_file")))
subprocess.run(pip_install_command, check=True)
return {"PYTHON": os.path.join(env_dir, "bin", "python3")}


Expand Down