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

Bump python3 version to 3.13.1 #1620

Merged
merged 3 commits into from
Jan 2, 2025
Merged

Bump python3 version to 3.13.1 #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ad3f04
chore: Update the `python3` version in the goss test
jenkins-infra-bot Jan 2, 2025
ac461d2
chore: Update the python3 version in the tools-versions.yml file
jenkins-infra-bot Jan 2, 2025
0f9f9b2
hotfix(windows) compute Python installation dir from its version
dduportal Jan 2, 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
2 changes: 1 addition & 1 deletion provisioning/tools-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ nodejs_linux_version: 22.12.0
nodejs_windows_version: 22.12.0
openssh_authorized_keys_url: https://raw.githubusercontent.com/jenkins-infra/aws/main/ec2_agents_authorized_keys
packer_version: 1.11.2
python3_version: 3.12.6
python3_version: 3.13.1
ruby_puppet_version: 2.6.10
ruby_version: 3.3.6
sops_version: 3.9.3
Expand Down
9 changes: 6 additions & 3 deletions provisioning/windows-provision.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ New-Item -ItemType Directory -Path $baseDir -Force | Out-Null
$dockerPluginsDir = 'C:\ProgramData\docker\cli-plugins'
New-Item -ItemType Directory -Path $dockerPluginsDir -Force | Out-Null

# Compute the future python installation dir
$pythondir = 'C:\python{0}' -f "${env:PYTHON3_VERSION}".Replace(".", "").Substring(0, 3)

# Ensure NuGet package provider is initialized (non-interactively)
Get-PackageProvider NuGet -ForceBootstrap

Expand Down Expand Up @@ -258,7 +261,7 @@ $downloads = [ordered]@{
& Remove-Item -Force -Recurse "$baseDir\chocolatey.tmp";
};
'cleanupLocal' = 'true';
'path' = "C:\HashiCorp\Vagrant\;C:\Program Files\Amazon\AWSCLIV2\;c:\python312\;C:\python312\Scripts\;";
'path' = "C:\HashiCorp\Vagrant\;C:\Program Files\Amazon\AWSCLIV2\;${pythondir}\;${pythondir}\Scripts\;";
'postInstall' = {
# Installation of make for Windows
& "choco.exe" install make --yes --no-progress --limit-output --fail-on-error-output;
Expand All @@ -280,8 +283,8 @@ $downloads = [ordered]@{
# Installation of python3 for Launchable
& "choco.exe" install python3 --yes --no-progress --limit-output --fail-on-error-output --version "${env:PYTHON3_VERSION}";
# Installation of Launchable globally (no other python tool)
& "c:\python312\python.exe" -m pip --no-cache-dir --upgrade install setuptools wheel pip;
& "c:\python312\python.exe" -m pip --no-cache-dir install launchable=="${env:LAUNCHABLE_VERSION}";
& "${pythondir}\python.exe" -m pip --no-cache-dir --upgrade install setuptools wheel pip;
& "${pythondir}\python.exe" -m pip --no-cache-dir install launchable=="${env:LAUNCHABLE_VERSION}";
};
};
}
Expand Down
2 changes: 1 addition & 1 deletion tests/goss-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ command:
exec: python --version
exit-status: 0
stdout:
- 3.12.6
- 3.13.1
ruby:
exec: ruby -v
exit-status: 0
Expand Down