Skip to content

[python] Handle PEP 440 local prerelease versions #94

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
gnufede merged 1 commit into from
Jun 23, 2026
+10 −7
Merged

[python] Handle PEP 440 local prerelease versions #94

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
12 changes: 6 additions & 6 deletions internal/platform/python.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ import (
"github.com/DataDog/ddtest/internal/version"
)

// pep440PreReleaseRe matches PEP 440 pre-release suffixes (a/b/rc + digits) embedded
// directly in a version component, e.g. "0rc1" or "12b3". We normalize these to
// semver-style by inserting a hyphen so the existing parser can handle them.
var pep440PreReleaseRe = regexp.MustCompile(`^(\d+\.\d+(?:\.\d+)*)((?:a|b|rc)\d+)$`)
// pep440PreReleaseRe matches PEP 440 pre-release suffixes (a/b/rc + digits)
// embedded directly in a Python package version, preserving optional local
// version metadata, e.g. "4.12.0rc1+gabc123".
var pep440PreReleaseRe = regexp.MustCompile(`^(\d+\.\d+(?:\.\d+)*)(a|b|rc)(\d+)(\+.*)?$`)

// normalizePyVersion converts PEP 440 version strings to semver-compatible ones.
// "4.12.0rc1" → "4.12.0-rc1", "4.10.3" → "4.10.3" (unchanged).
// "4.12.0rc1+gabc123" -> "4.12.0-rc1+gabc123"; "4.10.3" is unchanged.
func normalizePyVersion(v string) string {
return pep440PreReleaseRe.ReplaceAllString(v, "$1-$2")
return pep440PreReleaseRe.ReplaceAllString(v, "$1-$2$3$4")
}

//go:embed scripts/python_env.py
Expand Down
5 changes: 4 additions & 1 deletion internal/platform/python_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ func TestPython_Name(t *testing.T) {
func TestNormalizePyVersion(t *testing.T) {
cases := []struct{ in, want string }{
{"4.12.0rc1", "4.12.0-rc1"},
{"4.12.0rc1+g0e3e598", "4.12.0-rc1+g0e3e598"},
{"4.12.0b2", "4.12.0-b2"},
{"4.12.0b2+gabc123", "4.12.0-b2+gabc123"},
{"4.12.0a1", "4.12.0-a1"},
{"4.12.0a1+local.build", "4.12.0-a1+local.build"},
{"4.10.3", "4.10.3"},
{"1.2.3.4", "1.2.3.4"},
}
Expand All @@ -36,7 +39,7 @@ func TestNormalizePyVersion(t *testing.T) {

func TestPython_SanityCheck_SuccessWithPreRelease(t *testing.T) {
mockExecutor := &mockCommandExecutor{
combinedOutput: []byte("4.12.0rc1\n"),
combinedOutput: []byte("4.12.0rc1+g0e3e598\n"),
}
python := NewPython()
python.executor = mockExecutor
Expand Down
Loading