Skip to content

Derive the CI Python version from the package's requires-python.#1050

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
gerrod3 merged 1 commit into from
Sep 1, 2026
Merged

Derive the CI Python version from the package's requires-python. #1050

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
1 change: 1 addition & 0 deletions CHANGES/+min-python-from-package.feature
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
Read the package's `requires-python` and use that minimum version when installing Python in CI.
2 changes: 1 addition & 1 deletion plugin-template
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -389,7 +389,7 @@ def write_template_section(
"section": section,
"setup_py": (plugin_root_dir / "setup.py").exists(),
"ci_update_branches": utils.ci_update_branches(config),
"python_version": "3.11",
"python_version": utils.min_python_version(plugin_root_dir),
"ci_update_hour": sum((ord(c) for c in config["plugin_app_label"])) % 24,
"current_version": utils.current_version(plugin_root_dir),
"pulpdocs_branch": PULPDOCS_BRANCH,
Expand Down
2 changes: 1 addition & 1 deletion templates/github/.github/workflows/ci.yml.j2
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ jobs:
steps:
{{ checkout(depth=0, path=plugin_name) | indent(6) }}

{{ setup_python("3.12") | indent(6) }}
{{ setup_python() | indent(6) }}

@mdellwegmdellwegAug 27, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think this workflow does not execute any code from the plugin. So it should be fine (and maybe wise?) to let the template decide.

@mdellwegmdellwegAug 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Not a blocking requirement however...

We could also start transitioning this job to uv.

@gerrod3gerrod3Aug 31, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It already uses uv: https://github.com/pulp/plugin_template/blob/main/templates/include/macros.j2#L40

All the ci jobs should use uv now.

@mdellwegmdellwegSep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Sorry I was not wording this right. The templates use uv pip install as a drop in replacement (makes me wonder if you could even do alias pip "uv pip" these days.).
What I meant was using uv run --script instead, where the script tells uv it needs gitpython.

Anyway none of this ought to block this PR.


{{ install_python_deps(["gitpython"]) | indent(6) }}

Expand Down
26 changes: 26 additions & 0 deletions utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,8 @@
import tomlkit
import tomllib
import yaml
from packaging.specifiers import SpecifierSet
from packaging.version import Version

# Jinja tests and filters

Expand DownExpand Up@@ -94,6 +96,30 @@ def current_version(plugin_root_path):
return current_version


DEFAULT_PYTHON_VERSION = "3.11"
_PYTHON_MINOR_RANGE = range(6, 40)


def python_version_from_requires(requires_python):
"""Return the lowest CPython 3.x series that can satisfy requires-python."""
spec = SpecifierSet(requires_python)
for minor in _PYTHON_MINOR_RANGE:
# Probe a high micro so ">=3.11.4" still selects the 3.11 series.
if Version(f"3.{minor}.999") in spec:
return f"3.{minor}"
return DEFAULT_PYTHON_VERSION


def min_python_version(plugin_root_path):
"""Read [project] requires-python and return the minimum 3.x series, e.g. '3.11'."""
try:
path = plugin_root_path / "pyproject.toml"
requires_python = tomllib.loads(path.read_text())["project"]["requires-python"]
return python_version_from_requires(requires_python)
except Exception:
return DEFAULT_PYTHON_VERSION


def get_pulpdocs_members(pulpdocs_branch="main") -> list[str]:
"""
Get repositories which are members of the Pulp managed documentation.
Expand Down
Loading