Skip to content

Commit 75dcd13

Browse files
committed
Okay, no heredocs in yamls, happy now?
1 parent 01217cc commit 75dcd13

File tree

3 files changed

+16
-40
lines changed

3 files changed

+16
-40
lines changed

.github/workflows/wheels-template.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,7 @@ jobs:
6767
url="https://www.python.org/ftp/python/${version}/${installer_filename}"
6868
curl $url -o $installer_filename
6969
if [[ "${formal_version}" =~ .*t$ ]]; then
70-
# taken from:
71-
# https://docs.python.org/3.13/using/mac.html#installing-using-the-command-line
72-
cat > ./choicechanges.plist <<'PLIST_END'
73-
<?xml version="1.0" encoding="UTF-8"?>
74-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
75-
<plist version="1.0">
76-
<array>
77-
<dict>
78-
<key>attributeSetting</key>
79-
<integer>1</integer>
80-
<key>choiceAttribute</key>
81-
<string>selected</string>
82-
<key>choiceIdentifier</key>
83-
<string>org.python.Python.PythonTFramework-${formal_version%%t}</string>
84-
</dict>
85-
</array>
86-
</plist>
87-
PLIST_END
88-
sudo installer -pkg $installer_filename -applyChoiceChangesXML ./choicechanges.plist -target /
70+
sudo installer -pkg $installer_filename -applyChoiceChangesXML packaging/python/macos_installer_patch${formal_version}.plist -target /
8971
else
9072
sudo installer -pkg $installer_filename -target /
9173
fi

azure-pipelines.yml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,7 @@ stages:
136136
url=https://www.python.org/ftp/python/$(python.org.version)/$installer
137137
curl $url -o $installer
138138
if [[ "$(python.version)" =~ .*t$ ]]; then
139-
version="$(python.version)"
140-
version="${version%%t}"
141-
# taken from:
142-
# https://docs.python.org/3.13/using/mac.html#installing-using-the-command-line
143-
cat > ./choicechanges.plist <<'PLIST_END'
144-
<?xml version="1.0" encoding="UTF-8"?>
145-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
146-
<plist version="1.0">
147-
<array>
148-
<dict>
149-
<key>attributeSetting</key>
150-
<integer>1</integer>
151-
<key>choiceAttribute</key>
152-
<string>selected</string>
153-
<key>choiceIdentifier</key>
154-
<string>org.python.Python.PythonTFramework-${version}</string>
155-
</dict>
156-
</array>
157-
</plist>
158-
PLIST_END
159-
sudo installer -pkg $installer_filename -applyChoiceChangesXML ./choicechanges.plist -target /
139+
sudo installer -pkg $installer_filename -applyChoiceChangesXML packaging/python/macos_installer_patch_$(python.version).plist -target /
160140
else
161141
sudo installer -pkg $installer_filename -target /
162142
fi
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<array>
5+
<dict>
6+
<key>attributeSetting</key>
7+
<integer>1</integer>
8+
<key>choiceAttribute</key>
9+
<string>selected</string>
10+
<key>choiceIdentifier</key>
11+
<string>org.python.Python.PythonTFramework-3.13</string>
12+
</dict>
13+
</array>
14+
</plist>

0 commit comments

Comments
 (0)