fix: Improve python version handling

features/src/python/NOTES.md

@@ -0,0 +1,11 @@
+## Notes
+
+### .0 versions for old Python versions
+
+Python <= 3.2 didn't use correct semver and therefore the .0 version was missing the .0 (eg. 3.1.0 was only released as 3.1).
+
+Because of this, it is not possible to install an exact .0 version for those Python releases, it will take the newest patch release in that case.
+
+Example:
+* version 3.1 => would install 3.1.5
+* version 3.1.0 => would unfortunately fail

features/src/python/README.md

@@ -6,7 +6,7 @@ A package which installs Python.
 
 ```json
 "features": {
-    "ghcr.io/postfinance/devcontainer-features/python:0.1.0": {
+    "ghcr.io/postfinance/devcontainer-features/python:0.2.0": {
         "version": "latest",
         "downloadUrl": "",
         "pipIndex": "",
@@ -32,3 +32,15 @@ A package which installs Python.
 
 - `ms-python.python`
 - `ms-python.vscode-pylance`
+
+## Notes
+
+### .0 versions for old Python versions
+
+Python <= 3.2 didn't use correct semver and therefore the .0 version was missing the .0 (eg. 3.1.0 was only released as 3.1).
+
+Because of this, it is not possible to install an exact .0 version for those Python releases, it will take the newest patch release in that case.
+
+Example:
+* version 3.1 => would install 3.1.5
+* version 3.1.0 => would unfortunately fail

features/src/python/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "python",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "name": "Python",
     "description": "A package which installs Python.",
     "options": {

features/src/python/installer.go

@@ -17,7 +17,7 @@ import (
 // Configuration
 //////////
 
-var pythonVersionRegexp *regexp.Regexp = regexp.MustCompile(`^(?P<d1>\d+)\.(?P<d2>\d+)(?:\.(?P<d3>\d+))?(?:(?P<s4>[a-z]+)(?P<d5>\d+))?$`)
+var pythonVersionRegexp *regexp.Regexp = regexp.MustCompile(`^v(?P<raw>(\d+)\.(\d+)(?:\.(\d+))?(?:([a-z]+)(\d+))?)$`)
 
 //////////
 // Main
@@ -110,7 +110,7 @@ func (c *pythonComponent) InstallVersion(version *gover.Version) error {
 	}
 	// Create a symlink to the installed python version
 	symLinkPath := "/usr/local/python/current"
-	targetPath := fmt.Sprintf("/usr/local/python/%s", folderName)
+	targetPath := fmt.Sprintf("/usr/local/python/%s", version.Raw)
 	if err := installer.Tools.FileSystem.CreateSymLink(targetPath, symLinkPath, false); err != nil {
 		return err
 	}

features/test/python/install-alpha.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+[[ -f "$(dirname "$0")/../functions.sh" ]] && source "$(dirname "$0")/../functions.sh"
+[[ -f "$(dirname "$0")/functions.sh" ]] && source "$(dirname "$0")/functions.sh"
+
+check_version "$(python --version)" "Python 3.15.0a1"

features/test/python/scenarios.json

@@ -11,5 +11,18 @@
                 "version": "3.9.19"
             }
         }
+    },
+    "install-alpha": {
+        "build": {
+            "dockerfile": "Dockerfile",
+            "options": [
+                "--add-host=host.docker.internal:host-gateway"
+            ]
+        },
+        "features": {
+            "./python": {
+                "version": "3.15.0a1"
+            }
+        }
     }
 }

installer/apk.go

@@ -1,6 +1,7 @@
 package installer
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/roemer/gotaskr/execr"
@@ -11,7 +12,7 @@ type apk struct{}
 func (a apk) InstallDependencies(dependencies ...string) error {
 	args := append([]string{"add", "--no-cache"}, dependencies...)
 	if err := execr.Run(true, "apk", args...); err != nil {
-		return err
+		return fmt.Errorf("failed to install dependencies: %w", err)
 	}
 	return nil
 }
@@ -21,7 +22,7 @@ func (a apk) InstallLocalPackage(packagePath string) error {
 		packagePath = "./" + packagePath
 	}
 	if err := execr.Run(true, "apk", "add", "--no-cache", packagePath); err != nil {
-		return err
+		return fmt.Errorf("failed to install local package: %w", err)
 	}
 	return nil
 }

installer/apt.go

@@ -15,11 +15,11 @@ func (a apt) InstallDependencies(dependencies ...string) error {
 		return nil
 	}
 	if err := execr.Run(false, "apt-get", "update"); err != nil {
-		return err
+		return fmt.Errorf("failed to update apt-get: %w", err)
 	}
 	args := append([]string{"install", "-y"}, dependencies...)
 	if err := execr.Run(true, "apt-get", args...); err != nil {
-		return err
+		return fmt.Errorf("failed to install dependencies: %w", err)
 	}
 	a.CleanCache()
 	return nil
@@ -30,10 +30,10 @@ func (a apt) InstallLocalPackage(packagePath string) error {
 		packagePath = "./" + packagePath
 	}
 	if err := execr.Run(false, "apt-get", "update"); err != nil {
-		return err
+		return fmt.Errorf("failed to update apt-get: %w", err)
 	}
 	if err := execr.Run(true, "apt-get", "install", "-y", packagePath); err != nil {
-		return err
+		return fmt.Errorf("failed to install local package: %w", err)
 	}
 	a.CleanCache()
 	return nil

installer/feature.go

@@ -96,7 +96,7 @@ func (f *Feature) Process() error {
 					return err
 				}
 				// Get the max according to the reference version
-				versionToInstall = gover.FindMax(allVersions, referenceVersion, false)
+				versionToInstall = gover.FindMax(allVersions, referenceVersion, true)
 			}
 		}