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

[macos] Remove python2 UnixTools and adjust brew symlinks #8452

Merged
merged 8 commits into from
Oct 15, 2023
Merged

[macos] Remove python2 UnixTools and adjust brew symlinks #8452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14886ae
[macos] Add choices to python2 installation and remove 2to3 overwrite
shamil-mubarakshin Sep 7, 2023
cb45130
[macos] Remove unused python2 pester test
shamil-mubarakshin Sep 7, 2023
fb85002
[macos] Modify pester tests and software report
shamil-mubarakshin Sep 8, 2023
aa83472
[macos] Change sed to xmllint
shamil-mubarakshin Sep 11, 2023
b00aea9
[macos] Add comments
shamil-mubarakshin Oct 3, 2023
de31393
Run installer with sudo
shamil-mubarakshin Oct 3, 2023
3602e14
Merge branch 'main' into macos-unlink-python-brew
shamil-mubarakshin Oct 12, 2023
6dbcac4
Merge branch 'main' into macos-unlink-python-brew
shamil-mubarakshin Oct 12, 2023
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
17 changes: 13 additions & 4 deletions images/macos/provision/core/python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,18 @@ if is_Monterey || is_BigSur; then
echo "Install latest Python 2"
Python2Url="https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg"
download_with_retries $Python2Url "/tmp" "python2.pkg"
sudo installer -pkg /tmp/python2.pkg -target /

sudo installer -showChoiceChangesXML -pkg /tmp/python2.pkg -target / > /tmp/python2_choices.xml

# To avoid symlink conflicts, remove tools installation in /usr/local/bin using installer choices
xmllint --shell /tmp/python2_choices.xml <<EOF
cd //array/dict[string[text()='org.python.Python.PythonUnixTools-2.7']]/integer
set 0
save
EOF

sudo installer -applyChoiceChangesXML /tmp/python2_choices.xml -pkg /tmp/python2.pkg -target /

pip install --upgrade pip

echo "Install Python2 certificates"
Expand All @@ -19,10 +30,8 @@ if is_Veertu; then
close_finder_window
fi

# Explicitly overwrite symlinks created by Python2 such as /usr/local/bin/2to3 since they conflict with symlinks from Python3
# https://github.com/actions/runner-images/issues/2322
echo "Brew Installing Python 3"
brew_smart_install "python@3.11" || brew link --overwrite python@3.11
brew_smart_install "python@3.11"

echo "Installing pipx"
export PIPX_BIN_DIR=/usr/local/opt/pipx_bin
Expand Down
4 changes: 2 additions & 2 deletions images/macos/software-report/SoftwareReport.Common.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function Get-PipVersion {
[int] $Version
)

$command = If ($Version -eq 2) { "pip --version" } Else { "pip3 --version" }
$command = If ($Version -eq 2) { "/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" } Else { "pip3 --version" }
$commandOutput = Run-Command $command
$versionPart1 = $commandOutput | Take-Part -Part 1
$versionPart2 = $commandOutput | Take-Part -Part 4
Expand Down Expand Up @@ -192,7 +192,7 @@ function Get-PerlVersion {
}

function Get-PythonVersion {
$pythonVersion = Run-Command "python --version"
$pythonVersion = Run-Command "/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version"
return ($pythonVersion -replace "^Python").Trim()
}

Expand Down
12 changes: 2 additions & 10 deletions images/macos/tests/Python.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,11 @@ Describe "Python3" -Skip:($os.IsVenturaArm64) {

Describe "Python2" -Skip:($os.IsVenturaArm64 -or $os.IsVentura) {
It "Python 2 is available" {
"python --version" | Should -ReturnZeroExitCode
}

It "Python 2 is real 2.x" {
(Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*"
}

It "Python 2 is installed under /usr/local/bin" {
Get-WhichTool "python" | Should -BeLike "/usr/local/bin*"
"/Library/Frameworks/Python.framework/Versions/2.7/bin/python --version" | Should -ReturnZeroExitCode
}

It "Pip 2 is available" {
"pip --version" | Should -ReturnZeroExitCode
"/Library/Frameworks/Python.framework/Versions/2.7/bin/pip --version" | Should -ReturnZeroExitCode
}

It "2to3 symlink does not point to Python 2" {
Expand Down