Skip to content
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

Jump to bottom

Remove 3.10, add 3.12 #444

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove 3.10, add 3.12 #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ jobs:
strategy:
fail-fast: false
matrix:
python_version: ["3.6", "3.9", "3.10", "3.11"]
# 3.6: SLE15
# 3.9: RHEL/Centos/Liberty 9
# 3.11: SLES15/Tumbleweed
# 3.12: Ubuntu 24.04
python_version: ["3.6", "3.9", "3.11", "3.12"]
container:
image: registry.suse.com/bci/python:${{ matrix.python_version }}
steps:
Expand Down Expand Up @@ -159,15 +163,18 @@ jobs:
steps:
- name: Clean up disk space to maximize available space
run: sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc /opt/hostedtoolcache/CodeQL && sudo docker image prune --all --force

- name: checkout source code
uses: actions/checkout@v4
- name: Install tox
run: sudo apt update && sudo apt install tox

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install tox
run: sudo apt update && sudo apt install tox

- name: Install ldap-utils to have ldapwhoami for the 389ds tests
run: |
sudo apt-get update
Expand Down
8 changes: 6 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[tox]
envlist = {py36,py39,py310,py311,py312}-unit, build, all, base, fips, init, dotnet, python, ruby, node, go, openjdk, openjdk_devel, rust, php, busybox, 389ds, metadata, minimal, multistage, repository, doc, lint, get_urls, pcp, distribution, postgres, git, helm, nginx, kernel_module, mariadb, tomcat, spack, gcc
min_version = 3.8
envlist = {py36,py39,py311,py312}-unit, build, all, base, fips, init, dotnet, python, ruby, node, go, openjdk, openjdk_devel, rust, php, busybox, 389ds, metadata, minimal, multistage, repository, doc, lint, get_urls, pcp, distribution, postgres, git, helm, nginx, kernel_module, mariadb, tomcat, spack, gcc
isolated_build = True
skip_missing_interpreters = True
skip_install = True

[common]
deps =
Expand All @@ -17,6 +19,7 @@ deps =
doc: Sphinx

[testenv]
basepython = python3.11
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason why you are hardcoding the tests to use python 3.11? That will cause a giant headache for QA, who are using the system python in openQA.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is still a draft, I'm trying to find a workable path forward to get it to not use the system python. however, for SLE15 I don't see a problem with requiring python311 for the QA team. it might be more difficult for the tests on non-SLE hosts, but one problem at a time.

deps =
{[common]deps}
# Require a recent version of psycopg2 to avoid poo#128900
Expand All @@ -42,7 +45,8 @@ passenv =
commands =
pytest -vv tests/test_{envname}.py --junitxml={toxinidir}/junit_{envname}.xml --pytest-container-log-level=debug []

[testenv:{py36,py39,py310,py311,py312}-unit]
[testenv:{py36,py39,py311,py312}-unit]
ignore_basepython_conflict = True
commands =
pytest -n auto tests/test_unit.py --junitxml={toxinidir}/junit_unit.xml []
deps =
Expand Down
Loading